From 4eb8ddfe43f70976d7934a108527124d080b3f4e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 Aug 2018 15:04:13 +0200 Subject: Merging upstream version 20180825. Signed-off-by: Daniel Baumann --- share/scripts/debconf | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'share/scripts/debconf') diff --git a/share/scripts/debconf b/share/scripts/debconf index 77a974a..5325c11 100755 --- a/share/scripts/debconf +++ b/share/scripts/debconf @@ -155,9 +155,6 @@ Upgrade_system () mount -o bind /proc "${DIRECTORY}/proc" mount -o bind /sys "${DIRECTORY}/sys" - # Bind mount systems apt cache - mount -o bind /var/cache/apt/archives "${DIRECTORY}/var/cache/apt/archives" - # Disable dpkg syncing cat > "${DIRECTORY}/etc/dpkg/dpkg.cfg.d/container-tools" << EOF @@ -182,9 +179,6 @@ EOF # Install systemd support packages Chroot "${DIRECTORY}" "apt-get --yes install dbus libpam-systemd systemd-sysv" - # Unmount systems apt cache - umount "${DIRECTORY}/var/cache/apt/archives" - Chroot "${DIRECTORY}" "apt-get clean" } @@ -740,6 +734,18 @@ EOF rm -f "${DIRECTORY}/.container-command" fi + + for NUMBER in $(seq 1 ${CONTAINER_COMMAND_NUMBER}) + do + eval COMMAND="$`echo CONTAINER_COMMAND${NUMBER}`" + + echo "${COMMAND}" > "${DIRECTORY}/.container-command" + + chmod 0755 "${DIRECTORY}/.container-command" + Chroot "${DIRECTORY}" "sh /.container-command" + + rm -f "${DIRECTORY}/.container-command" + done } Configure_network () @@ -988,6 +994,19 @@ Commands () rm -f "${DIRECTORY}/.host-command" fi + for NUMBER in $(seq 1 ${HOST_COMMAND_NUMBER}) + do + eval COMMAND="$`echo HOST_COMMAND${NUMBER}`" + + echo "${COMMAND}" > "${DIRECTORY}/.host-command" + + cd "${DIRECTORY}" + sh "${DIRECTORY}/.host-command" + cd "${OLDPWD}" + + rm -f "${DIRECTORY}/.host-command" + done + # Show root password in case its automatically set case "${ROOT_RANDOM_PASSWORD}" in true) -- cgit v1.2.3