X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rawdevices.init;h=739ec4c4bd032c891ddcf876dd6c629fbc553763;hb=72962280a5fd65b52ca77f1246eb233859181fd1;hp=991c0e3d79adc5b7ab608caa0d9cf825336ab2a0;hpb=9df5ab0d0d707ff008354f3ede16ca55366872e4;p=packages%2Futil-linux.git

diff --git a/rawdevices.init b/rawdevices.init
index 991c0e3..739ec4c 100644
--- a/rawdevices.init
+++ b/rawdevices.init
@@ -1,14 +1,14 @@
 #!/bin/bash
 #
-# rawdevices       This shell script assignes rawdevices to block devices
+# rawdevices	This shell script assignes rawdevices to block devices
 #
-# chkconfig: 345 56 44
-# description: This scripts assignes raw devices to block devices \
-#              (such as hard drive partitions). This is for the use \
-#	       of applications such as Oracle. You can set up the \
-#	       raw device to block device mapping by editing \
-#	       the file /etc/sysconfig/rawdevices.
-# config: /etc/sysconfig/rawdevices
+# chkconfig:	345 56 44
+# description:	This scripts assignes raw devices to block devices \
+#		(such as hard drive partitions). This is for the use \
+#		of applications such as Oracle. You can set up the \
+#		raw device to block device mapping by editing \
+#		the file /etc/sysconfig/rawdevices.
+# config:	/etc/sysconfig/rawdevices
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -25,36 +25,33 @@ PATH=/usr/bin:/bin:/usr/sbin:/sbin
 
 function assign_raw()
 {
-   cat /etc/sysconfig/rawdevices | egrep -v '^ *#' | while read RAW BLOCK; do 
-     if [ -n "$RAW" -a -n "$BLOCK" ]; then 
-         if [ "`dirname $RAW`" = "/dev" -a -d /dev/raw ]; then
-           echo $"  Please correct your /etc/sysconfig/rawdevices:"
-           echo $"     rawdevices are now located in the directory /dev/raw/ "
-           echo $"  If the command 'raw' still refers to /dev/raw as a file."
-           echo $"   you'll have to upgrade your util-linux package"
-           exit 0
-         fi
-         if [ "`dirname $RAW`" = "/dev/raw" -a -f /dev/raw ]; then
-           echo $"  Please correct your /etc/sysconfig/rawdevices:"
-           echo $"     rawdevices are now located in the directory /dev/raw/ "
-           echo $"  If the command 'raw' still refers to /dev/raw as a file."
-           echo $"   you'll have to upgrade your util-linux package"
-           exit 0
-         fi
+	cat /etc/sysconfig/rawdevices | egrep -v '^ *#' | while read RAW BLOCK; do
+	if [ -n "$RAW" -a -n "$BLOCK" ]; then
+		if [ "`dirname $RAW`" = "/dev" -a -d /dev/raw ]; then
+			nls " Please correct your /etc/sysconfig/rawdevices:"
+			nls " rawdevices are now located in the directory /dev/raw/ "
+			nls " If the command 'raw' still refers to /dev/raw as a file."
+			nls " You'll have to upgrade your util-linux package"
+			exit 0
+		fi
+		if [ "`dirname $RAW`" = "/dev/raw" -a -f /dev/raw ]; then
+			nls " Please correct your /etc/sysconfig/rawdevices:"
+			nls " rawdevices are now located in the directory /dev/raw/ "
+			nls " If the command 'raw' still refers to /dev/raw as a file."
+			nls " You'll have to upgrade your util-linux package"
+			exit 0
+		fi
 
-       show "Assigning device: $RAW --> $BLOCK"
-       busy
-       raw $RAW $BLOCK > /dev/null
-       deltext
-       ok
-     fi
-   done
+		show "$(nls "Assigning device: %s --> %s" "$RAW" "$BLOCK")"
+		busy
+		raw $RAW $BLOCK > /dev/null
+		ok
+	fi
+	done
 }
 
-# See how we were called.
-case "$1" in
-  start)
-  	if [ ! -f /var/lock/subsys/rawdevices ]; then
+start() {
+	if [ ! -f /var/lock/subsys/rawdevices ]; then
 		msg_starting rawdevices
 		ok
 		assign_raw
@@ -62,37 +59,44 @@ case "$1" in
 	else
 		msg_already_running rawdevices
 	fi
-        ;;
-  stop)
-  	if [ -f /var/lock/subsys/rawdevices ]; then
+}
+
+stop() {
+	if [ -f /var/lock/subsys/rawdevices ]; then
 		msg_stopping rawdevices
 		busy
 		rm -f /var/lock/subsys/rawdevices >/dev/null 2>&1
-		deltext
 		ok
 	else
 		msg_not_running rawdevices
-		exit 1
 	fi
-        ;;
+}
 
+# See how we were called.
+case "$1" in
+  start|reload)
+  	start
+	;;
+  stop)
+  	stop
+	;;
   status)
-        ID=`id -u`
-        if [ $ID -eq 0 ]; then 
-          raw -qa
-        else
-          echo $"You need to be root to use this command ! "
-        fi
-        ;;
-
-  restart|reload)
-  	$0 stop
-        $0 start
-        ;;
+	id=`id -u`
+	if [ "$id" -eq 0 ]; then
+		raw -qa
+	else
+		# don't remove the space at the end!!!
+		nls "You need to be root to use this command ! "
+	fi
+	;;
+  restart|force-reload)
+	stop
+	start
+	;;
 
   *)
-        msg_usage "$0 {start|stop|status|restart}"
-        exit 1
+	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+	exit 3
 esac
 
 exit 0