summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2017-04-05 17:03:31 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2017-04-05 17:03:35 +0000
commit10aa1ea674f74572a6b0a25ed16d2efec86cd82e (patch)
treec27ee510ff6b5804b0e9f878de7da5d65492ef73 /share
parentReleasing debian version 20170401-1. (diff)
downloadopen-infrastructure-compute-tools-10aa1ea674f74572a6b0a25ed16d2efec86cd82e.tar.xz
open-infrastructure-compute-tools-10aa1ea674f74572a6b0a25ed16d2efec86cd82e.zip
Merging upstream version 20170405.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rwxr-xr-xshare/scripts/debconf14
1 files changed, 3 insertions, 11 deletions
diff --git a/share/scripts/debconf b/share/scripts/debconf
index df9241c..e4c342e 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -168,8 +168,8 @@ EOF
# Upgrade system
Chroot "${DIRECTORY}" "apt-get update"
- Chroot "${DIRECTORY}" "apt-get --yes --option APT::Force-LoopBreak=true upgrade"
- Chroot "${DIRECTORY}" "apt-get --yes --option APT::Force-LoopBreak=true dist-upgrade"
+ Chroot "${DIRECTORY}" "apt-get --yes --option APT::Force-LoopBreak=true --option Dpkg::Options::=--force-confnew upgrade"
+ Chroot "${DIRECTORY}" "apt-get --yes --option APT::Force-LoopBreak=true --option Dpkg::Options::=--force-confnew dist-upgrade"
# Install systemd support packages
Chroot "${DIRECTORY}" "apt-get --yes install dbus libpam-systemd systemd-sysv"
@@ -704,15 +704,7 @@ EOF
# Workaround: We're running lxc-support at the end of the template again.
if [ -n "${PACKAGES}" ]
then
- case "${DEBCONF_FRONTEND}" in
- noninteractive)
- Chroot "${DIRECTORY}" apt-get --option APT::Force-LoopBreak=true --option Dpkg::Options::="--force-overwrite" --option Dpkg::Options::="--force-confold" --yes install ${PACKAGES}
- ;;
-
- *)
- Chroot "${DIRECTORY}" "apt-get --option APT::Force-LoopBreak=true --yes install ${PACKAGES}"
- ;;
- esac
+ Chroot "${DIRECTORY}" "apt-get --option APT::Force-LoopBreak=true --option Dpkg::Options::=--force-confnew --yes install ${PACKAGES}"
fi
# Manual hack to regenerate ssh keys