X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=771ab85aedd9fa9f89e960c179576927b18bb687;hb=9211faa0a71579dcf6c4f193804dd5443bb40bf9;hp=203ee4c524ce3a782cb3b01266a3f5fef8bfa50f;hpb=68225b36e91baa1998611b59dd48b4c1cbe8abaa;p=live-boot-grml.git

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