projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding proper code comments about vol_id removal.
[live-boot-grml.git]
/
scripts
/
live-helpers
diff --git
a/scripts/live-helpers
b/scripts/live-helpers
index
6edd51c
..
6777f99
100644
(file)
--- a/
scripts/live-helpers
+++ b/
scripts/live-helpers
@@
-76,16
+76,14
@@
is_supported_fs ()
get_fstype ()
{
get_fstype ()
{
- # udev
>=146-1 no longer provides vol_id:
+ # udev
(>= 146) no longer provides vol_id
if [ -x /lib/udev/vol_id ]
then
if [ -x /lib/udev/vol_id ]
then
+ # lenny
/lib/udev/vol_id -t ${1} 2>/dev/null
else
/lib/udev/vol_id -t ${1} 2>/dev/null
else
- eval $(blkid -o udev "${1}")
- if [ -n "$ID_FS_TYPE" ]
- then
- echo "${ID_FS_TYPE}"
- fi
+ # squeeze
+ /sbin/blkid -s TYPE -o value $1 2>/dev/null
fi
}
fi
}
@@
-191,14
+189,7
@@
setup_loop ()
modprobe -q -b "${module}"
modprobe -q -b "${module}"
- if [ -x /sbin/udevadm ]
- then
- # lenny
- udevadm settle
- else
- # etch
- udevsettle
- fi
+ udevadm settle
for loopdev in ${pattern}
do
for loopdev in ${pattern}
do
@@
-350,17
+341,18
@@
find_cow_device ()
done
fi
done
fi
- # udev
>=146-1 no longer provides vol_id:
+ # udev
(>= 146) no longer provides vol_id
if [ -x /lib/udev/vol_id ]
then
if [ -x /lib/udev/vol_id ]
then
+ # lenny
if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
then
echo "${devname}"
return 0
fi
else
if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
then
echo "${devname}"
return 0
fi
else
- eval $(blkid -o udev "${devname}")
- if [ "$
ID_FS_LABEL
" = "${pers_label}" ]
+ # squeeze
+ if [ "$
(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)
" = "${pers_label}" ]
then
echo "${devname}"
return 0
then
echo "${devname}"
return 0