[SCM] Debian Live build scripts branch, master, updated. 1.0.1-3-6-g08aa2e1

Daniel Baumann daniel at debian.org
Mon Dec 1 22:52:51 UTC 2008


The following commit has been merged in the master branch:
commit 08aa2e1f2274ce4149183195dca9755dfd536a5a
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Dec 1 23:49:58 2008 +0100

    Correcting defaults check for diverted losetup binary to also cope with host systems that do install loop-aes-utils after populating live-helper config.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 0469ca0..2841142 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -162,7 +162,7 @@ Set_defaults ()
 	fi
 
 	# Setting losetup
-	if [ -z "${LH_LOSETUP}" ] || [ ! -x /sbin/${LH_LOSETUP} ]
+	if [ -z "${LH_LOSETUP}" ] || [ "${LH_LOSETUP}" != "/sbin/losetup.orig" ]
 	then
 		# Workaround for loop-aes-utils divertion
 		# (loop-aes-utils' losetup lacks features).

-- 
Debian Live build scripts



More information about the debian-live-changes mailing list