projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4632ef1
)
Prefer removable devices over non-removable devices, so scan them first.
author
Michael Prokop
<mika@grml.org>
Fri, 2 Apr 2010 14:33:23 +0000
(16:33 +0200)
committer
Daniel Baumann
<daniel@debian.org>
Fri, 2 Apr 2010 14:33:23 +0000
(16:33 +0200)
scripts/live
patch
|
blob
|
history
diff --git
a/scripts/live
b/scripts/live
index
bae9193
..
8ad11bb
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-1627,8
+1627,20
@@
find_livefs ()
esac
# or do the scan of block devices
esac
# or do the scan of block devices
+ # prefer removable devices over non-removable devices, so scan them first
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
do
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
do
+ if [ "$(cat ${sysblock}/removable)" = "1" ]
+ then
+ removable_devices_to_scan="$removable_devices_to_scan $sysblock"
+ else
+ nonremovable_devices_to_scan="$nonremovable_devices_to_scan $sysblock"
+ fi
+ done
+ devices_to_scan="$removable_devices_to_scan $nonremovable_devices_to_scan"
+
+ for sysblock in $devices_to_scan
+ do
devname=$(sys2dev "${sysblock}")
fstype=$(get_fstype "${devname}")
devname=$(sys2dev "${sysblock}")
fstype=$(get_fstype "${devname}")