1 #! /bin/sh /usr/share/dpatch/dpatch-run
2 ## 14_prefer_removable_devices.dpatch by Michael Prokop <mika@grml.org>
4 ## All lines beginning with `## DP:' are a description of the patch.
5 ## DP: prefer removable devices over non-removable devices, so scan them first
8 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' live-initramfs-grml~/scripts/live live-initramfs-grml/scripts/live
9 --- live-initramfs-grml~/scripts/live 2010-03-11 09:21:56.059389954 +0100
10 +++ live-initramfs-grml/scripts/live 2010-03-11 10:17:05.482395328 +0100
11 @@ -1669,8 +1669,20 @@
14 # or do the scan of block devices
15 + # prefer removable devices over non-removable devices, so scan them first
16 for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
18 + if [ "$(cat ${sysblock}/removable)" = "1" ]
20 + removable_devices_to_scan="$removable_devices_to_scan $sysblock"
22 + nonremovable_devices_to_scan="$nonremovable_devices_to_scan $sysblock"
25 + devices_to_scan="$removable_devices_to_scan $nonremovable_devices_to_scan"
27 + for sysblock in $devices_to_scan
29 devname=$(sys2dev "${sysblock}")
30 fstype=$(get_fstype "${devname}")