summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--src/Propellor/Bootstrap.hs4
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index d3c84858..d04ea16f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ propellor (2.15.2) UNRELEASED; urgency=medium
* Added GNUPGBIN environment variable to control the command run for gpg.
Allows eg, GNUPGBIN=gpg2
Thanks, FĂ©lix Sipma.
+ * Bootstrap apt-get installs run with deconf noninteractive frontend.
-- Joey Hess <id@joeyh.name> Wed, 30 Dec 2015 15:01:19 -0400
diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs
index f2f5af55..c49cb5af 100644
--- a/src/Propellor/Bootstrap.hs
+++ b/src/Propellor/Bootstrap.hs
@@ -63,7 +63,7 @@ depsCommand = "( " ++ intercalate " ; " (concat [osinstall, cabalinstall]) ++ "
, "cabal install --only-dependencies"
]
- aptinstall p = "apt-get --no-upgrade --no-install-recommends -y install " ++ p
+ aptinstall p = "DEBIAN_FRONTEND=noninteractive apt-get --no-upgrade --no-install-recommends -y install " ++ p
-- This is the same deps listed in debian/control.
debdeps =
@@ -86,7 +86,7 @@ depsCommand = "( " ++ intercalate " ; " (concat [osinstall, cabalinstall]) ++ "
]
installGitCommand :: ShellCommand
-installGitCommand = "if ! git --version >/dev/null; then apt-get update && apt-get --no-install-recommends --no-upgrade -y install git; fi"
+installGitCommand = "if ! git --version >/dev/null; then apt-get update && DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends --no-upgrade -y install git; fi"
buildPropellor :: IO ()
buildPropellor = unlessM (actionMessage "Propellor build" build) $