summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Bex <peter@more-magic.net>2016-03-19 20:51:44 +0100
committerPeter Bex <peter@more-magic.net>2016-03-19 20:51:44 +0100
commite78d5ae792397e49fbb3cd41911f0d576fe901a0 (patch)
treefb47fa1cdfbe7308a148585b9483442a84a25a80
parent05c060932cd7409323838051c84424e617564a2f (diff)
downloadvps-builder-e78d5ae792397e49fbb3cd41911f0d576fe901a0.tar.gz
Move DEBIAN_FRONTEND up, because with-running-system is too late
We already call dpkg-reconfigure tzdata before with-running-system...
-rw-r--r--vps-builder.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/vps-builder.scm b/vps-builder.scm
index 5b15ba6..5397878 100644
--- a/vps-builder.scm
+++ b/vps-builder.scm
@@ -125,10 +125,12 @@
(dynamic-wind
(lambda ()
(set! tempdir (create-temporary-directory))
+ (setenv "DEBIAN_FRONTEND" "noninteractive")
(run* (mount -o loop ,device ,tempdir)))
(lambda () (proc tempdir))
(lambda ()
(run* (umount ,tempdir))
+ (unsetenv "DEBIAN_FRONTEND")
(delete-directory tempdir #t)
(set! tempdir #f)))))
@@ -140,11 +142,9 @@
(run* (chroot ,root-dir mount /proc))
;; Don't run daemons in the chroot upon apt-get install
(install-file root-dir "assets/chroot-helpers/policy-rc.d"
- "/usr/sbin/policy-rc.d" "root" "root" #o755)
- (setenv "DEBIAN_FRONTEND" "noninteractive"))
+ "/usr/sbin/policy-rc.d" "root" "root" #o755))
(lambda () (thunk))
(lambda ()
- (unsetenv "DEBIAN_FRONTEND")
(delete-file* (make-pathname root-dir "/usr/sbin/policy-rc.d"))
(run* (chroot ,root-dir umount /proc)))))