[Debian-live-changes] r1146 - dists/trunk/live-helper/helpers

[Daniel Baumann]

Author: daniel
Date: 2007-04-24 07:10:10 +0000 (Tue, 24 Apr 2007)
New Revision: 1146

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-04-24 07:03:57 UTC (rev 1145)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-04-24 07:10:10 UTC (rev 1146)
@@ -96,8 +96,13 @@
 		# Restore old cache
 		if [ -d cache/chroot_bootstrap ]
 		then
-			cp -a cache/chroot_bootstrap/* chroot
+			${LH_ROOT_COMMAND} cp -a cache/chroot_bootstrap/* chroot
 
+			if [ -n "${LH_ROOT_COMMAND}" ]
+			then
+				${LH_ROOT_COMMAND} chown `whoami`:`whoami` chroot -R
+			fi
+
 			# Creating stage file
 			Create_stagefile .stage/bootstrap
 
@@ -166,7 +171,12 @@
 			rm -rf cache/chroot_bootstrap
 		fi
 
-		cp -a chroot cache/chroot_bootstrap
+		${LH_ROOT_COMMAND} cp -a chroot cache/chroot_bootstrap
+
+		if [ -n "${LH_ROOT_COMMAND}" ]
+		then
+			${LH_ROOT_COMMAND} chown `whoami`:`whoami` cache/chroot_bootstrap -R
+		fi
 	fi
 
 	# Creating stage file

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap	2007-04-24 07:03:57 UTC (rev 1145)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap	2007-04-24 07:10:10 UTC (rev 1146)
@@ -79,8 +79,13 @@
 		# Restore old cache
 		if [ -d cache/chroot_bootstrap ]
 		then
-			cp -a cache/chroot_bootstrap/* chroot
+			${LH_ROOT_COMMAND} cp -a cache/chroot_bootstrap/* chroot
 
+			if [ -n "${LH_ROOT_COMMAND}" ]
+			then
+				${LH_ROOT_COMMAND} chown `whoami`:`whoami` chroot -R
+			fi
+
 			# Creating stage file
 			Create_stagefile .stage/bootstrap
 
@@ -135,7 +140,12 @@
 			rm -rf cache/chroot_bootstrap
 		fi
 
-		cp -a chroot cache/chroot_bootstrap
+		${LH_ROOT_COMMAND} cp -a chroot cache/chroot_bootstrap
+
+		if [ -n "${LH_ROOT_COMMAND}" ]
+		then
+			${LH_ROOT_COMMAND} chown `whoami`:`whoami` cache/chroot_bootstrap -R
+		fi
 	fi
 
 	# Creating stage file