[Debian-live-changes] r1527 - in dists/trunk/live-helper: functions helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-17 12:31:12 +0000 (Thu, 17 May 2007)
New Revision: 1527

Modified:
   dists/trunk/live-helper/functions/chroot.sh
   dists/trunk/live-helper/helpers/lh_chroot_local-hooks
Log:


Modified: dists/trunk/live-helper/functions/chroot.sh
===================================================================
--- dists/trunk/live-helper/functions/chroot.sh	2007-05-17 12:07:28 UTC (rev 1526)
+++ dists/trunk/live-helper/functions/chroot.sh	2007-05-17 12:31:12 UTC (rev 1527)
@@ -16,4 +16,6 @@
 	# Executing commands in chroot
 	Echo_debug "Executing: ${COMMANDS}"
 	${LH_ROOT_COMMAND} chroot chroot /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTPPROXY}" http_proxy="${LH_APT_HTTPPROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" ${COMMANDS}
+
+	return "${?}"
 }

Modified: dists/trunk/live-helper/helpers/lh_chroot_local-hooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-hooks	2007-05-17 12:07:28 UTC (rev 1526)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-hooks	2007-05-17 12:31:12 UTC (rev 1527)
@@ -61,7 +61,7 @@
 		fi
 
 		# Executing hook
-		Chroot "/root/`basename ${HOOK}`"
+		Chroot "/root/`basename ${HOOK}`" || true
 
 		# Removing hook
 		rm -f chroot/root/"`basename ${HOOK}`"