manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure that precached-chroots are prepared as well.

This commit is contained in:
Daniel Baumann 2009-12-21 14:33:03 +01:00
parent 6f6b524142
commit 8d96dae42d
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
helpers/lh_binary_rootfs
View File

@ -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

5
helpers/lh_chroot_dpkg
View File

@ -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