SOURCES: vrootdevices.init - fixed errors

[baggins]

Author: baggins                      Date: Wed Nov 23 15:04:21 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixed errors

---- Files affected:
SOURCES:
   vrootdevices.init (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/vrootdevices.init
diff -u SOURCES/vrootdevices.init:1.1 SOURCES/vrootdevices.init:1.2
--- SOURCES/vrootdevices.init:1.1	Tue Nov 22 19:04:46 2005
+++ SOURCES/vrootdevices.init	Wed Nov 23 16:03:56 2005
@@ -8,11 +8,9 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
-[ -f /etc/sysconfig/vrootdevices ] && . /etc/sysconfig/vrootdevices
-
-function assign_vroot()
+assign_vroot()
 {
-	cat /etc/sysconfig/rawdevices | egrep -v '^ *#' | while read VROOT BLOCK; do
+	cat /etc/sysconfig/vrootdevices | egrep -v '^ *#' | while read VROOT BLOCK; do
 	if [ -n "$VROOT" -a -n "$BLOCK" ]; then
 		if [ -d /dev/vroot ]; then
 			VROOT="/dev/vroot/$VROOT"
@@ -27,9 +25,9 @@
 	done
 }
 
-function remove_vroot()
+remove_vroot()
 {
-	cat /etc/sysconfig/rawdevices | egrep -v '^ *#' | while read VROOT BLOCK; do
+	cat /etc/sysconfig/vrootdevices | egrep -v '^ *#' | while read VROOT BLOCK; do
 	if [ -n "$VROOT" -a -n "$BLOCK" ]; then
 		if [ -d /dev/vroot ]; then
 			VROOT="/dev/vroot/$VROOT"
@@ -78,6 +76,7 @@
   restart|force-reload)
 	$0 stop
 	$0 start
+	;;
   *)
 	echo "Usage: $0 {start|stop|restart|reload|force-reload|status}"
 	exit 3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/vrootdevices.init?r1=1.1&r2=1.2&f=u