r2767 - dists/trunk/live-helper/helpers

[lamby-guest at alioth.debian.org]

Author: lamby-guest
Date: 2007-08-15 16:32:00 +0000 (Wed, 15 Aug 2007)
New Revision: 2767

Modified:
   dists/trunk/live-helper/helpers/lh_chroot_dpkg
   dists/trunk/live-helper/helpers/lh_clean
Log:
Fixes typo in restoring start-stop-daemon which was causing all init scripts using this daemon to silently fail

Modified: dists/trunk/live-helper/helpers/lh_chroot_dpkg
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_dpkg	2007-08-15 05:49:43 UTC (rev 2766)
+++ dists/trunk/live-helper/helpers/lh_chroot_dpkg	2007-08-15 16:32:00 UTC (rev 2767)
@@ -76,7 +76,7 @@
 		Echo_message "Deconfiguring file /sbin/start-stop-daemon"
 
 		# Restore start-stop-daemon program
-		mv chroot/sbin/start-stop-daemon.org chroot/sbin/start-stop-daemon
+		mv chroot/sbin/start-stop-daemon.orig chroot/sbin/start-stop-daemon
 
 		# Removing stage file
 		rm -f .stage/chroot_dpkg

Modified: dists/trunk/live-helper/helpers/lh_clean
===================================================================
--- dists/trunk/live-helper/helpers/lh_clean	2007-08-15 05:49:43 UTC (rev 2766)
+++ dists/trunk/live-helper/helpers/lh_clean	2007-08-15 16:32:00 UTC (rev 2767)
@@ -54,6 +54,7 @@
 		;;
 
 	chroot)
+		Echo_message "Cleaning chroot"
 		${LH_ROOT_COMMAND} umount -f chroot/sys > /dev/null 2>&1 || true
 		${LH_ROOT_COMMAND} umount -f chroot/proc/sys/fs/binfmt_misc > /dev/null 2>&1 || true
 		${LH_ROOT_COMMAND} umount -f chroot/proc > /dev/null 2>&1 || true