packages: util-linux/util-linux-blockdev.init - cosmetics
glen
glen at pld-linux.org
Sun Aug 14 12:03:37 CEST 2011
Author: glen Date: Sun Aug 14 10:03:37 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- cosmetics
---- Files affected:
packages/util-linux:
util-linux-blockdev.init (1.16 -> 1.17)
---- Diffs:
================================================================
Index: packages/util-linux/util-linux-blockdev.init
diff -u packages/util-linux/util-linux-blockdev.init:1.16 packages/util-linux/util-linux-blockdev.init:1.17
--- packages/util-linux/util-linux-blockdev.init:1.16 Thu Feb 10 23:44:39 2011
+++ packages/util-linux/util-linux-blockdev.init Sun Aug 14 12:03:32 2011
@@ -27,45 +27,82 @@
. /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 @@
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}"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux-blockdev.init?r1=1.16&r2=1.17&f=u
More information about the pld-cvs-commit
mailing list