[Debian-live-changes] r1998 - dists/trunk/live-helper/helpers
daniel at alioth.debian.org
daniel at alioth.debian.org
Sun Jun 10 14:06:02 UTC 2007
Author: daniel
Date: 2007-06-10 14:06:02 +0000 (Sun, 10 Jun 2007)
New Revision: 1998
Modified:
dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap
Log:
Modified: dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap 2007-06-10 13:57:50 UTC (rev 1997)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap 2007-06-10 14:06:02 UTC (rev 1998)
@@ -44,6 +44,7 @@
# Checking stage file
Check_stagefile .stage/bootstrap
+Check_stagefile .stage/bootstrap_cache.restore
# Checking lock file
Check_lockfile .lock
@@ -94,25 +95,6 @@
if [ -x "/usr/bin/cdebootstrap" ]
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 ]
@@ -163,24 +145,6 @@
# Removing bootstrap cache
rm -rf chroot/var/cache/bootstrap
- # Saving new cache
- for STAGE in ${LH_CACHE_STAGES}
- do
- if [ "${STAGE}" = "bootstrap" ]
- then
- rm -rf cache/stages_bootstrap
-
- 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
Modified: dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap 2007-06-10 13:57:50 UTC (rev 1997)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap 2007-06-10 14:06:02 UTC (rev 1998)
@@ -44,6 +44,7 @@
# Checking stage file
Check_stagefile .stage/bootstrap
+Check_stagefile .stage/bootstrap_cache.restore
# Checking lock file
Check_lockfile .lock
@@ -72,25 +73,6 @@
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,24 +112,6 @@
# 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
- rm -rf cache/stages_bootstrap
-
- 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
More information about the Debian-live-changes
mailing list