From c0f2a41c8e9da23a8f17dc34c9cfea2e2a9cb358 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Mon, 21 Dec 2009 14:33:03 +0100
Subject: Ensure that precached-chroots are prepared as well.
---
helpers/lh_binary_rootfs | 26 ++++++++++++++++++++++++++
helpers/lh_chroot_dpkg | 5 ++++-
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index 2c06ff4..b9c6d26 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -147,11 +147,15 @@ case "${LH_CHROOT_FILESYSTEM}" in
rm -f .lock
mv chroot/chroot chroot.tmp
+ lh chroot_linux-image remove ${*}
lh chroot_sources remove ${*}
lh chroot_apt remove ${*}
lh chroot_hostname remove ${*}
lh chroot_resolv remove ${*}
lh chroot_hosts remove ${*}
+ lh chroot_sysv-rc remove ${*}
+ lh chroot_dpkg remove ${*}
+ lh chroot_debianchroot remove ${*}
lh chroot_sysfs remove ${*}
lh chroot_selinuxfs remove ${*}
lh chroot_proc remove ${*}
@@ -164,11 +168,15 @@ case "${LH_CHROOT_FILESYSTEM}" in
lh chroot_proc install ${*}
lh chroot_selinuxfs install ${*}
lh chroot_sysfs install ${*}
+ lh chroot_debianchroot install ${*}
+ lh chroot_dpkg install ${*}
+ lh chroot_sysv-rc install ${*}
lh chroot_hosts install ${*}
lh chroot_resolv install ${*}
lh chroot_hostname install ${*}
lh chroot_apt install ${*}
lh chroot_sources install ${*}
+ lh chroot_linux-image install ${*}
touch .lock
else
@@ -221,11 +229,15 @@ case "${LH_CHROOT_FILESYSTEM}" in
rm -f .lock
mv chroot/chroot chroot.tmp
+ lh chroot_linux-image remove ${*}
lh chroot_sources remove ${*}
lh chroot_apt remove ${*}
lh chroot_hostname remove ${*}
lh chroot_resolv remove ${*}
lh chroot_hosts remove ${*}
+ lh chroot_sysv-rc remove ${*}
+ lh chroot_dpkg remove ${*}
+ lh chroot_debianchroot remove ${*}
lh chroot_sysfs remove ${*}
lh chroot_selinuxfs remove ${*}
lh chroot_proc remove ${*}
@@ -238,11 +250,17 @@ case "${LH_CHROOT_FILESYSTEM}" in
lh chroot_proc install ${*}
lh chroot_selinuxfs install ${*}
lh chroot_sysfs install ${*}
+ lh chroot_debianchroot install ${*}
+ lh chroot_dpkg install ${*}
+ lh chroot_sysv-rc install ${*}
lh chroot_hosts install ${*}
lh chroot_resolv install ${*}
lh chroot_hostname install ${*}
lh chroot_apt install ${*}
lh chroot_sources install ${*}
+ lh chroot_linux-image install ${*}
+
+ touch .lock
else
rm -rf chroot/chroot
fi
@@ -323,11 +341,15 @@ case "${LH_CHROOT_FILESYSTEM}" in
rm -f .lock
mv chroot/chroot chroot.tmp
+ lh chroot_linux-image remove ${*}
lh chroot_sources remove ${*}
lh chroot_apt remove ${*}
lh chroot_hostname remove ${*}
lh chroot_resolv remove ${*}
lh chroot_hosts remove ${*}
+ lh chroot_sysv-rc remove ${*}
+ lh chroot_dpkg remove ${*}
+ lh chroot_debianchroot remove ${*}
lh chroot_sysfs remove ${*}
lh chroot_selinuxfs remove ${*}
lh chroot_proc remove ${*}
@@ -340,11 +362,15 @@ case "${LH_CHROOT_FILESYSTEM}" in
lh chroot_proc install ${*}
lh chroot_selinuxfs install ${*}
lh chroot_sysfs install ${*}
+ lh chroot_debianchroot install ${*}
+ lh chroot_dpkg install ${*}
+ lh chroot_sysv-rc install ${*}
lh chroot_hosts install ${*}
lh chroot_resolv install ${*}
lh chroot_hostname install ${*}
lh chroot_apt install ${*}
lh chroot_sources install ${*}
+ lh chroot_linux-image install ${*}
touch .lock
else
diff --git a/helpers/lh_chroot_dpkg b/helpers/lh_chroot_dpkg
index 7fd6e67..bf2950a 100755
--- a/helpers/lh_chroot_dpkg
+++ b/helpers/lh_chroot_dpkg
@@ -66,7 +66,10 @@ EOF
Create_lockfile .lock
# Restore start-stop-daemon program
- mv chroot/sbin/start-stop-daemon.orig chroot/sbin/start-stop-daemon
+ if [ -e chroot/sbin/start-stop-daemon.orig ]
+ then
+ mv chroot/sbin/start-stop-daemon.orig chroot/sbin/start-stop-daemon
+ fi
# Removing stage file
rm -f .stage/chroot_dpkg
--
cgit v1.0