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
0e9b0d0
..
06bd186
100644
(file)
--- a/
scripts/live-helpers
+++ b/
scripts/live-helpers
@@
-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
@@
-275,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
}
@@
-297,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}")
if echo "${black_listed_devices}" | grep -q -w "${devname}"
then
for dev in $(subdevices "${sysblock}")
do
devname=$(sys2dev "${dev}")
if echo "${black_listed_devices}" | grep -q -w "${devname}"
then
- # skip this
device enterely
+ # skip this
subdevice
break
fi
break
fi
@@
-383,6
+391,14
@@
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}")
for dev in $(subdevices "${sysblock}")
do
devname=$(sys2dev "${dev}")
@@
-390,7
+406,7
@@
find_files ()
if echo "${black_listed_devices}" | grep -q -w "${devname}"
then
if echo "${black_listed_devices}" | grep -q -w "${devname}"
then
- # skip this
device enterely
+ # skip this
subdevice
break
fi
break
fi