From fc12bec5266efb237f7e1a1f06ec021d73c22a82 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Sun, 14 Aug 2011 10:03:32 +0000
Subject: [PATCH] - cosmetics

Changed files:
    util-linux-blockdev.init -> 1.17
---
 util-linux-blockdev.init | 120 +++++++++++++++++++++------------------
 1 file changed, 65 insertions(+), 55 deletions(-)

diff --git a/util-linux-blockdev.init b/util-linux-blockdev.init
index b5040a3..e202f39 100644
--- a/util-linux-blockdev.init
+++ b/util-linux-blockdev.init
@@ -27,45 +27,82 @@ fi
 . /etc/sysconfig/blockdev
 
 start() {
-	if [ ! -f /var/lock/subsys/blockdev ]; then
-		for var in $blockdevs; 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=\$$var
-				if [ -n "${PARAMS}" ]; then
-					show "Setting parameters for block drive %s (%s)" "$drive" "$PARAMS"
-					busy
-					/sbin/blockdev ${PARAMS} $realdrive
-					ok
-				fi
-			fi
-		done
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/blockdev
-	else
+	if [ -f /var/lock/subsys/blockdev ]; then
 		msg_already_running blockdev
+		return
 	fi
+
+	local var realdrive drive PARAMS
+	for var in $blockdevs; 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=\$$var
+			if [ -n "${PARAMS}" ]; then
+				show "Setting parameters for block drive %s (%s)" "$drive" "$PARAMS"
+				busy
+				/sbin/blockdev ${PARAMS} $realdrive
+				ok
+			fi
+		fi
+	done
+	# TODO: retval not really handled here
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/blockdev
 }
 
 stop() {
 	# Stop daemons.
 	if [ ! -f /var/lock/subsys/blockdev ]; then
 		msg_not_running blockdev
+		return
 	fi
 	rm -f /var/lock/subsys/blockdev
 }
 
+status() {
+  	if [ -z "$blockdevs" ]; then
+		echo "no devices configured for blockdev"
+		RETVAL=1
+		return
+	fi
+
+	echo "blockdev configured for:"
+	local var drive realdrive PARAMS
+	for var in $blockdevs; do
+		drive=${var#BLOCKDEV_}
+		echo -n "- $drive: "
+
+		realdrive=
+		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
+
+		eval PARAMS=\$$var
+		if [ -n "$realdrive" ]; then
+			echo "${PARAMS}; device=$realdrive"
+		else
+			echo "${PARAMS}; device not present"
+		fi
+	done
+}
+
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -80,34 +117,7 @@ case "$1" in
 	start
 	;;
   status)
-  	if [ "$blockdevs" ]; then
-		echo "blockdev configured for:"
-		for var in $blockdevs; do
-			drive=${var#BLOCKDEV_}
-			echo -n "- $drive: "
-
-			realdrive=
-			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
-
-			eval PARAMS=\$$var
-			if [ -n "$realdrive" ]; then
-				echo "${PARAMS}; device=$realdrive"
-			else
-				echo "${PARAMS}; device not present"
-			fi
-
-		done
-	else
-		echo "no devices configured for blockdev"
-	fi
+	status
 	;;
   *)
 	msg_usage "$0 {start|stop|restart|force-reload|status}"
-- 
2.44.0