projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
scripts/live-helpers: Fixes for set -e
[live-boot-grml.git]
/
scripts
/
live-helpers
diff --git
a/scripts/live-helpers
b/scripts/live-helpers
index
203ee4c
..
771ab85
100644
(file)
--- a/
scripts/live-helpers
+++ b/
scripts/live-helpers
@@
-35,8
+35,8
@@
get_fstype ()
local FSSIZE
# fstype misreports LUKS devices
local FSSIZE
# fstype misreports LUKS devices
- is_luks "${1}"
-
if [ $? -eq 0 ];
then
+ i
f i
s_luks "${1}"
+ then
/lib/udev/vol_id -t ${1} 2>/dev/null
return
fi
/lib/udev/vol_id -t ${1} 2>/dev/null
return
fi
@@
-321,8
+321,8
@@
is_luks()
devname="${1}"
if [ -x /sbin/cryptsetup ]
then
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
else
return 1
fi