Author: glen                         Date: Thu Dec  7 20:54:53 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- exit early if not configured

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

---- Diffs:

================================================================
Index: SOURCES/util-linux-blockdev.init
diff -u SOURCES/util-linux-blockdev.init:1.9 
SOURCES/util-linux-blockdev.init:1.10
--- SOURCES/util-linux-blockdev.init:1.9        Tue Dec  5 20:23:14 2006
+++ SOURCES/util-linux-blockdev.init    Thu Dec  7 21:54:48 2006
@@ -9,15 +9,27 @@
 # config:
 # pidfile:
 
+if [ -f /etc/sysconfig/blockdev ]; then
+       blockdevs=$(awk -F= '!/^#/ && !/^$/ {if ($2) print $1}' 
/etc/sysconfig/blockdev)
+fi
+
+if [ -z "$blockdevs" ]; then
+       case "$1" in
+       start|stop|restart|force-reload)
+               exit 0
+               ;;
+       esac
+fi
+
 # Source function library.
 . /etc/rc.d/init.d/functions
 
 # Source blockdev configureation.
-[ -f /etc/sysconfig/blockdev ] && . /etc/sysconfig/blockdev
+. /etc/sysconfig/blockdev
 
 start() {
        if [ ! -f /var/lock/subsys/blockdev ]; then
-               for var in $(awk -F= '!/^#/ && !/^$/ {if ($2) print $1}' 
/etc/sysconfig/blockdev); do
+               for var in $blockdevs; do
                        realdrive=
                        drive=${var#BLOCKDEV_}
                        if [ -d "/sys/block/${drive}" -a -e "/dev/${drive}" ]; 
then
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to