From 677415f6d7efc1e5b888570d70af311d2900c69c Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 10:04:47 +0200
Subject: Adding live-helper 1.0~a2-1.

---
 helpers/lh_chroot_tasks | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'helpers/lh_chroot_tasks')

diff --git a/helpers/lh_chroot_tasks b/helpers/lh_chroot_tasks
index 4959d76cf..b2ffb8fab 100755
--- a/helpers/lh_chroot_tasks
+++ b/helpers/lh_chroot_tasks
@@ -16,23 +16,23 @@ Read_conffile config/chroot
 Set_defaults
 
 # Requiring stage file
-Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap
+Require_stagefile .stage/bootstrap
 
 # Checking stage file
-Check_stagefile "${LIVE_ROOT}"/.stage/chroot_tasks
+Check_stagefile .stage/chroot_tasks
 
 # Checking lock file
-Check_lockfile "${LIVE_ROOT}"/.lock
+Check_lockfile .lock
 
 # Creating lock file
-Create_lockfile "${LIVE_ROOT}"/.lock
+Create_lockfile .lock
 
 if [ -n "${LIVE_TASKS}" ] && [ "${LH_APT}" = "aptitude" ]
 then
 	# Restore old cache
-	if [ -d "${LIVE_ROOT}"/cache/chroot_tasks ]
+	if [ -d cache/chroot_tasks ]
 	then
-		cp "${LIVE_ROOT}"/cache/chroot_tasks/*.deb "${LIVE_CHROOT}"/var/cache/apt/archives
+		cp cache/chroot_tasks/*.deb chroot/var/cache/apt/archives
 	fi
 
 	Chroot "aptitude install --assume-yes ${LIVE_TASKS}"
@@ -40,16 +40,16 @@ then
 	# Saving new cache
 	Chroot "apt-get autoclean"
 
-	if ls "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb &> /dev/null
+	if ls chroot/var/cache/apt/archives/*.deb &> /dev/null
 	then
-		if [ ! -d "${LIVE_ROOT}"/cache/chroot_tasks ]
+		if [ ! -d cache/chroot_tasks ]
 		then
-			mkdir -p "${LIVE_ROOT}"/cache/chroot_tasks
+			mkdir -p cache/chroot_tasks
 		fi
 
-		mv -f "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb "${LIVE_ROOT}"/cache/chroot_tasks
+		mv -f chroot/var/cache/apt/archives/*.deb cache/chroot_tasks
 	fi
 
 	# Creating stage file
-	Create_stagefile "${LIVE_ROOT}"/.stage/chroot_tasks
+	Create_stagefile .stage/chroot_tasks
 fi
-- 
cgit v1.2.3