SOURCES: util-linux-blockdev.init - optimize in a way that nothing...

[glen]

Author: glen                         Date: Tue Dec  5 19:23:19 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- optimize in a way that nothing is done if config is empty

---- Files affected:
SOURCES:
   util-linux-blockdev.init (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SOURCES/util-linux-blockdev.init
diff -u SOURCES/util-linux-blockdev.init:1.8 SOURCES/util-linux-blockdev.init:1.9
--- SOURCES/util-linux-blockdev.init:1.8	Thu Nov 23 15:43:21 2006
+++ SOURCES/util-linux-blockdev.init	Tue Dec  5 20:23:14 2006
@@ -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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/util-linux-blockdev.init?r1=1.8&r2=1.9&f=u