projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prefer removable devices over non-removable devices, so scan them first.
[live-boot-grml.git]
/
scripts
/
live-helpers
diff --git
a/scripts/live-helpers
b/scripts/live-helpers
index
0cdc755
..
6777f99
100644
(file)
--- a/
scripts/live-helpers
+++ b/
scripts/live-helpers
@@
-76,11
+76,13
@@
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
+ # squeeze
/sbin/blkid -s TYPE -o value $1 2>/dev/null
fi
}
/sbin/blkid -s TYPE -o value $1 2>/dev/null
fi
}
@@
-339,15
+341,17
@@
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
+ # squeeze
if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
then
echo "${devname}"
if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
then
echo "${devname}"