summaryrefslogtreecommitdiff
path: root/helpers/lh_bootstrap_debootstrap
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:05:11 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:18:30 +0100
commit37a5c53ddd2825bf6b0ce521908a63d419683981 (patch)
tree0b0a8ea3072a4d6b9c37ce8efedb29d25a713e04 /helpers/lh_bootstrap_debootstrap
parent85c342c299231131d22764c0dfdcf977c57ce147 (diff)
downloadlive-build-37a5c53ddd2825bf6b0ce521908a63d419683981.zip
live-build-37a5c53ddd2825bf6b0ce521908a63d419683981.tar.gz
Adding live-helper 1.0~a14-1.
Diffstat (limited to 'helpers/lh_bootstrap_debootstrap')
-rwxr-xr-xhelpers/lh_bootstrap_debootstrap41
1 files changed, 1 insertions, 40 deletions
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap
index 58d36c4..b4307a1 100755
--- a/helpers/lh_bootstrap_debootstrap
+++ b/helpers/lh_bootstrap_debootstrap
@@ -44,6 +44,7 @@ lh_testroot
# Checking stage file
Check_stagefile .stage/bootstrap
+Check_stagefile .stage/bootstrap_cache.restore
# Checking lock file
Check_lockfile .lock
@@ -72,25 +73,6 @@ fi
if [ -x "/usr/sbin/debootstrap" ]
then
- for STAGE in ${LH_CACHE_STAGES}
- do
- if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ]
- then
- # Restore old cache
- ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap/* chroot
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
- fi
-
- # Creating stage file
- Create_stagefile .stage/bootstrap
-
- exit 0
- fi
- done
-
if [ "${LH_CACHE_PACKAGES}" = "enabled" ]
then
if [ -d cache/packages_bootstrap ]
@@ -130,27 +112,6 @@ then
# Removing bootstrap cache
rm -f chroot/var/cache/apt/archives/*.deb
- # Saving new cache
- for STAGE in ${LH_CACHE_STAGES}
- do
- if [ "${STAGE}" = "bootstrap" ]
- then
- if [ -d cache/stages_bootstrap ]
- then
- rm -rf cache/stages_bootstrap
- fi
-
- mkdir -p cache
-
- ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
-
- if [ -n "${LH_ROOT_COMMAND}" ]
- then
- ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_bootstrap
- fi
- fi
- done
-
# Creating stage file
Create_stagefile .stage/bootstrap
else