- optimize in a way that nothing is done if config is empty

Changed files:
    util-linux-blockdev.init -> 1.9

diff --git a/util-linux-blockdev.init b/util-linux-blockdev.init
index 7515eaef8fb543825ff8cd3e708985fc5171198a..e5c9e2e2b1f2616e53228f5ded3b429516d46507 100644 (file)
--- a/util-linux-blockdev.init
+++ b/util-linux-blockdev.init
@@ -17,18 +17,25 @@
 
 start() {
        if [ ! -f /var/lock/subsys/blockdev ]; then
-               for drive in $(ls /sys/block 2> /dev/null; ls /dev/mapper 2> /dev/null); do
-                       if [ [ -d "/sys/block/${drive}" -a -e "/dev/${drive}" ]; then
+               for var in $(awk -F= '!/^#/ && !/^$/ {if ($2) print $1}' /etc/sysconfig/blockdev); do
+                       realdrive=
+                       drive=${var#BLOCKDEV_}
+                       if [ -d "/sys/block/${drive}" -a -e "/dev/${drive}" ]; then
+                               realdrive="/dev/${drive}"
+                       elif [ -e "/dev/mapper/${drive}" ]; then
+                               realdrive="/dev/mapper/${drive}"
+                       elif drive=$(echo $drive | tr _ -) && [ -d "/sys/block/${drive}" -a -e "/dev/${drive}" ]; then
                                realdrive="/dev/${drive}"
                        elif [ -e "/dev/mapper/${drive}" ]; then
                                realdrive="/dev/mapper/${drive}"
                        fi
+
                        if [ -n "$realdrive" ]; then
-                               eval PARAMS=\$BLOCKDEV_$(echo $drive | tr - _)
+                               eval PARAMS=\$$var
                                if [ -n "${PARAMS}" ]; then
                                        show "Setting parameters for block drive %s (%s)" "$drive" "$PARAMS"
                                        busy
-                                       /sbin/blockdev ${PARAMS} ${realdrive}
+                                       /sbin/blockdev ${PARAMS} $realdrive
                                        ok
                                fi
                        fi