SOURCES: util-linux-blockdev.init - up

[arekm]

Author: arekm                        Date: Thu Nov 23 14:43:26 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up

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

---- Diffs:

================================================================
Index: SOURCES/util-linux-blockdev.init
diff -u SOURCES/util-linux-blockdev.init:1.7 SOURCES/util-linux-blockdev.init:1.8
--- SOURCES/util-linux-blockdev.init:1.7	Thu Nov 23 15:29:14 2006
+++ SOURCES/util-linux-blockdev.init	Thu Nov 23 15:43:21 2006
@@ -18,12 +18,17 @@
 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 [ -e "/dev/${drive}" ]; then
+			if [ [ -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 - _)
 				if [ -n "${PARAMS}" ]; then
 					show "Setting parameters for block drive %s (%s)" "$drive" "$PARAMS"
 					busy
-					/sbin/blockdev ${PARAMS} /dev/${drive}
+					/sbin/blockdev ${PARAMS} ${realdrive}
 					ok
 				fi
 			fi
================================================================

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