commit a4689ee18278443aaf10f72da623efba657a970a Author: Nicolas Vigier boklm@torproject.org Date: Tue Jan 29 16:17:15 2019 +0100
Bug 29194: Set DEBIAN_FRONTEND=noninteractive
Update rbm to set DEBIAN_FRONTEND=noninteractive when using apt-get in install_package.
Also set DEBIAN_FRONTEND=noninteractive for the other apt-get commands we use in debootstrap-image and container-image.
We now also use the -q (quiet) argument. --- projects/container-image/config | 5 +++-- projects/debootstrap-image/config | 5 +++-- rbm | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/projects/container-image/config b/projects/container-image/config index 95d7557..68c401a 100644 --- a/projects/container-image/config +++ b/projects/container-image/config @@ -17,11 +17,12 @@ pre: | #!/bin/sh # [% c('var/container/suite') %] set -e + export DEBIAN_FRONTEND=noninteractive [% IF pc(c('origin_project'), 'var/pre_pkginst') -%] [% pc(c('origin_project'), 'var/pre_pkginst') %] [% END -%] - apt-get update -y - apt-get upgrade -y + apt-get update -y -q + apt-get upgrade -y -q [% deps = []; IF pc(c('origin_project'), 'var/deps'); diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index ba34032..4dbbfef 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -14,10 +14,11 @@ var: pre: | #!/bin/sh set -e + export DEBIAN_FRONTEND=noninteractive # Bug 29158: install fixed packages for apt vulnerability (CVE-2019-3462) dpkg -i ./apt_1.6.6ubuntu0.1_amd64.deb ./libapt-pkg5.0_1.6.6ubuntu0.1_amd64.deb - apt-get update -y - apt-get install -y debian-archive-keyring ubuntu-keyring debootstrap + apt-get update -y -q + apt-get install -y -q debian-archive-keyring ubuntu-keyring debootstrap debootstrap --arch=[% c("var/container/arch") %] [% c("var/container/debootstrap_opt") %] [% c("var/container/suite") %] base-image [% c("var/container/debootstrap_mirror") %] [% IF c("var/apt_package_filename") || c("var/apt_utils_package_filename") || c("var/libapt_inst_package_filename") || c("var/libapt_pkg_package_filename") -%] mkdir ./base-image/apt-update diff --git a/rbm b/rbm index eb500fa..c61e694 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit eb500fa9467fb4d7229c9ca87f202ef18603d023 +Subproject commit c61e6940a1824462648064898be0759dd1600414