[SCM] debian-live/live-initramfs branch, master, updated. 1.125.1-1-7-g39f6aa4

[Chris Lamb]

The following commit has been merged in the master branch:
commit 7e33cb8bca27ff224efff9f54c764dadbee0b255
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Wed Mar 26 08:02:59 2008 +0000

    scripts/live-helpers: Fixes for set -e
    
    This patch applies two fixes intended for when "scripts/live-helpers" is
    sourced by a "set -e" script such as live-snapshot.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 203ee4c..771ab85 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -35,8 +35,8 @@ get_fstype ()
 	local FSSIZE
 
 	# fstype misreports LUKS devices
-	is_luks "${1}"
-	if [ $? -eq 0 ]; then
+	if is_luks "${1}"
+	then
 	    /lib/udev/vol_id -t ${1} 2>/dev/null
 	    return
 	fi
@@ -321,8 +321,8 @@ is_luks()
     devname="${1}"
     if [ -x /sbin/cryptsetup ]
     then
-	/sbin/cryptsetup isLuks "${devname}" 2>/dev/null
-	return $?
+	/sbin/cryptsetup isLuks "${devname}" 2>/dev/null || ret=${?}
+	return ${ret}
     else
 	return 1
     fi

-- 
debian-live/live-initramfs