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 upstream version 3.0~a16.
[live-boot-grml.git]
/
scripts
/
live-helpers
diff --git
a/scripts/live-helpers
b/scripts/live-helpers
index
d82efa5
..
06bd186
100644
(file)
--- a/
scripts/live-helpers
+++ b/
scripts/live-helpers
@@
-1,4
+1,4
@@
-# live-
initramfs helper functions, used by live-initramfs
on boot and by live-snapshot
+# live-
boot helper functions, used by live-boot
on boot and by live-snapshot
if [ ! -x "/bin/fstype" ]
then
if [ ! -x "/bin/fstype" ]
then
@@
-26,7
+26,7
@@
subdevices ()
sysblock=${1}
r=""
sysblock=${1}
r=""
- for dev in "${sysblock}"
"${sysblock}"/*
+ for dev in "${sysblock}"
/* "${sysblock}"
do
if [ -e "${dev}/dev" ]
then
do
if [ -e "${dev}/dev" ]
then
@@
-76,15
+76,7
@@
is_supported_fs ()
get_fstype ()
{
get_fstype ()
{
- # udev (>= 146) no longer provides vol_id
- if [ -x /lib/udev/vol_id ]
- then
- # lenny
- /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
}
where_is_mounted ()
}
where_is_mounted ()
@@
-283,7
+275,7
@@
try_mount ()
fstype=$(get_fstype "${dev}")
fi
mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || \
fstype=$(get_fstype "${dev}")
fi
mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || \
- ( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" > live.log && return 0 )
+ ( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" > live
-boot
.log && return 0 )
fi
}
fi
}
@@
-305,13
+297,21
@@
find_cow_device ()
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
do
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
do
+ fulldevname=$(sys2dev "${sysblock}")
+
+ if echo "${black_listed_devices}" | grep -q -w "${fulldevname}"
+ then
+ # skip this device entirely
+ break
+ fi
+
for dev in $(subdevices "${sysblock}")
do
devname=$(sys2dev "${dev}")
for dev in $(subdevices "${sysblock}")
do
devname=$(sys2dev "${dev}")
- if echo "${black_listed_devices}" | grep -q "${devname}"
+ if echo "${black_listed_devices}" | grep -q
-w
"${devname}"
then
then
- # skip this
device enterely
+ # skip this
subdevice
break
fi
break
fi
@@
-345,22
+345,10
@@
find_cow_device ()
done
fi
done
fi
- # udev (>= 146) no longer provides vol_id
- if [ -x /lib/udev/vol_id ]
+ if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
then
then
- # lenny
- 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}"
- return 0
- fi
+ echo "${devname}"
+ return 0
fi
if [ "${PERSISTENT}" = "nofiles" ]
fi
if [ "${PERSISTENT}" = "nofiles" ]
@@
-403,14
+391,22
@@
find_files ()
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
do
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
do
+ fulldevname=$(sys2dev "${sysblock}")
+
+ if echo "${black_listed_devices}" | grep -q -w "${fulldevname}"
+ then
+ # skip this device entirely
+ break
+ fi
+
for dev in $(subdevices "${sysblock}")
do
devname=$(sys2dev "${dev}")
devfstype="$(get_fstype ${devname})"
for dev in $(subdevices "${sysblock}")
do
devname=$(sys2dev "${dev}")
devfstype="$(get_fstype ${devname})"
- if echo "${black_listed_devices}" | grep -q "${devname}"
+ if echo "${black_listed_devices}" | grep -q
-w
"${devname}"
then
then
- # skip this
device enterely
+ # skip this
subdevice
break
fi
break
fi