projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging casper 1.124.
[live-boot-grml.git]
/
scripts
/
live-helpers
diff --git
a/scripts/live-helpers
b/scripts/live-helpers
index
5e1730b
..
807553a
100644
(file)
--- a/
scripts/live-helpers
+++ b/
scripts/live-helpers
@@
-34,6
+34,13
@@
get_fstype ()
local FSTYPE
local FSSIZE
local FSTYPE
local FSSIZE
+ # fstype misreports LUKS devices
+ is_luks "${1}"
+ if [ $? -eq 0 ]; then
+ /lib/udev/vol_id -t ${1} 2>/dev/null
+ return
+ fi
+
eval $(fstype < ${1})
if [ "${FSTYPE}" != "unknown" ]
eval $(fstype < ${1})
if [ "${FSTYPE}" != "unknown" ]
@@
-268,7
+275,7
@@
find_files ()
devname=$(sys2dev "${dev}")
devfstype="$(get_fstype ${devname})"
devname=$(sys2dev "${dev}")
devfstype="$(get_fstype ${devname})"
- if [ "${devfstype}" = "vfat" ] || [ "${devfstype}" = "ext2" ] || [ "${devfstype}" = "ext3" ]
+ if [ "${devfstype}" = "vfat" ] || [ "${devfstype}" = "ext2" ] || [ "${devfstype}" = "ext3" ]
|| [ "${devfstype}" = "jffs2" ]
then
# FIXME: all supported block devices should be scanned
mkdir -p "${snap_backing}"
then
# FIXME: all supported block devices should be scanned
mkdir -p "${snap_backing}"
@@
-306,3
+313,16
@@
get_mac ()
echo ${mac}
}
echo ${mac}
}
+
+is_luks()
+{
+ devname="${1}"
+ if [ -x /sbin/cryptsetup ]
+ then
+ /sbin/cryptsetup isLuks "${devname}" 2>/dev/null
+ return $?
+ else
+ return 1
+ fi
+
+}