X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=0e9b0d02d2cc655fdfbb270b2062fe1c629ea953;hb=274ce8e4e2b902e4e7b4871c284cee0285cf18a6;hp=6777f99772e6dc53a1f5599e19bc3d12648eeed7;hpb=088e23d8225c53f92bc12125d95a11e165869a9a;p=live-boot-grml.git diff --git a/scripts/live-helpers b/scripts/live-helpers index 6777f99..0e9b0d0 100644 --- 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 @@ -76,15 +76,7 @@ is_supported_fs () 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 () @@ -187,7 +179,11 @@ setup_loop () local encryption=${5} local readonly=${6} - modprobe -q -b "${module}" + # the output of setup_loop is evaluated in other functions, + # modprobe leaks kernel options like "libata.dma=0" + # as "options libata dma=0" on stdout, causing serious + # problems therefor, so instead always avoid output to stdout + modprobe -q -b "${module}" 1>/dev/null udevadm settle @@ -305,7 +301,7 @@ find_cow_device () do devname=$(sys2dev "${dev}") - if echo "${black_listed_devices}" | grep -q "${devname}" + if echo "${black_listed_devices}" | grep -q -w "${devname}" then # skip this device enterely break @@ -341,22 +337,10 @@ find_cow_device () 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 - # 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" ] @@ -404,7 +388,7 @@ find_files () 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 # skip this device enterely break