[Pkg-sysvinit-commits] r114 - in sysvinit/trunk/debian: . initscripts/etc/init.d

[Petter Reinholdtsen]

Author: pere
Date: 2005-11-12 14:02:29 +0000 (Sat, 12 Nov 2005)
New Revision: 114

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/halt
   sysvinit/trunk/debian/initscripts/etc/init.d/hostname.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
   sysvinit/trunk/debian/initscripts/etc/init.d/reboot
   sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin
   sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs
   sysvinit/trunk/debian/initscripts/etc/init.d/single
   sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
   sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/umountroot
   sysvinit/trunk/debian/initscripts/etc/init.d/urandom
Log:
  * Improve argument handling for init.d scripts.  Based on patch from
    Enrico Zini.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-11-12 13:09:50 UTC (rev 113)
+++ sysvinit/trunk/debian/changelog	2005-11-12 14:02:29 UTC (rev 114)
@@ -21,6 +21,8 @@
     origin. (Closes: #336873)
   * Revert fix for bug #295335, as the manual page patch is reported
     to be incorrect.  Commented out 10_doc_lastb.dpatch from patches/00list.
+  * Improve argument handling for init.d scripts.  Based on patch from
+    Enrico Zini.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat,  8 Oct 2005 17:08:47 +0200
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh	2005-11-12 13:09:50 UTC (rev 113)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh	2005-11-12 14:02:29 UTC (rev 114)
@@ -84,9 +84,17 @@
 
 case "$1" in
     start)
-    	do_start
-	;;
+        do_start
+        ;;
+    restart|reload|force-reload)
+        echo "error: '$0 $1' not supported"
+        exit 1
+        ;;
+    stop)
+        ;;
     *)
+        echo "Usage: $0 start|stop|restart|reload|force-reload"
+        exit 1
         ;;
 esac
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2005-11-12 13:09:50 UTC (rev 113)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2005-11-12 14:02:29 UTC (rev 114)
@@ -69,9 +69,17 @@
 
 case "$1" in
     start)
-    	do_start
-	;;
+        do_start
+        ;;
+    restart|reload|force-reload)
+        echo "error: '$0 $1' not supported"
+        exit 1
+        ;;
+    stop)
+        ;;
     *)
+        echo "Usage: $0 start|stop|restart|reload|force-reload"
+        exit 1
         ;;
 esac
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-11-12 13:09:50 UTC (rev 113)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-11-12 14:02:29 UTC (rev 114)
@@ -359,9 +359,17 @@
 
 case "$1" in
     start)
-    	do_start
-	;;
+        do_start
+        ;;
+    restart|reload|force-reload)
+        echo "error: '$0 $1' not supported"
+        exit 1
+        ;;
+    stop)
+        ;;
     *)
+        echo "Usage: $0 start|stop|restart|reload|force-reload"
+        exit 1
         ;;
 esac
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/halt
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/halt	2005-11-12 13:09:50 UTC (rev 113)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/halt	2005-11-12 14:02:29 UTC (rev 114)
@@ -59,10 +59,18 @@
 }
 
 case "$1" in
+    start)
+        ;;
+    restart|reload|force-reload)
+        echo "error: $0 $1 not supported"
+        exit 1
+        ;;
     stop)
-    	do_stop
-	;;
+        do_stop
+        ;;
     *)
+        echo "Usage: $0 start|stop|restart|reload|force-reload"
+        exit 1
         ;;
 esac
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/hostname.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/hostname.sh	2005-11-12 13:09:50 UTC (rev 113)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/hostname.sh	2005-11-12 14:02:29 UTC (rev 114)
@@ -21,8 +21,16 @@
 
 case "$1" in
     start)
-    	do_start
-	;;
+        do_start
+        ;;
+    restart|reload|force-reload)
+        echo "error: '$0 $1' not supported"
+        exit 1
+        ;;
+    stop)
+        ;;
     *)
+        echo "Usage: $0 start|stop|restart|reload|force-reload"
+        exit 1
         ;;
 esac

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2005-11-12 13:09:50 UTC (rev 113)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2005-11-12 14:02:29 UTC (rev 114)
@@ -85,9 +85,17 @@
 
 case "$1" in
     start)
-    	do_start
-	;;
+        do_start
+        ;;
+    restart|reload|force-reload)
+        echo "error: '$0 $1' not supported"
+        exit 1
+        ;;
+    stop)
+        ;;
     *)
+        echo "Usage: $0 start|stop|restart|reload|force-reload"
+        exit 1
         ;;
 esac
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh	2005-11-12 13:09:50 UTC (rev 113)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh	2005-11-12 14:02:29 UTC (rev 114)
@@ -118,9 +118,17 @@
 
 case "$1" in
     start)
-    	do_start
-	;;
+        do_start
+        ;;
+    restart|reload|force-reload)
+        echo "error: '$0 $1' not supported"
+        exit 1
+        ;;
+    stop)
+        ;;
     *)
+        echo "Usage: $0 start|stop|restart|reload|force-reload"
+        exit 1
         ;;
 esac
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-11-12 13:09:50 UTC (rev 113)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-11-12 14:02:29 UTC (rev 114)
@@ -241,8 +241,16 @@
 
 case "$1" in
     start)
-    	do_start
-	;;
+        do_start
+        ;;
+    restart|reload|force-reload)
+        echo "error: '$0 $1' not supported"
+        exit 1
+        ;;
+    stop)
+        ;;
     *)
+        echo "Usage: $0 start|stop|restart|reload|force-reload"
+        exit 1
         ;;
 esac

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/reboot
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/reboot	2005-11-12 13:09:50 UTC (rev 113)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/reboot	2005-11-12 14:02:29 UTC (rev 114)
@@ -23,9 +23,17 @@
 }
 
 case "$1" in
+    start)
+        ;;
+    restart|reload|force-reload)
+        echo "error: '$0 $1' not supported"
+        exit 1
+        ;;
     stop)
-    	do_stop
-	;;
+        do_stop
+        ;;
     *)
+        echo "Usage: $0 start|stop|restart|reload|force-reload"
+        exit 1
         ;;
 esac

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin	2005-11-12 13:09:50 UTC (rev 113)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin	2005-11-12 14:02:29 UTC (rev 114)
@@ -35,9 +35,17 @@
 
 case "$1" in
     start)
-    	do_start
-	;;
+        do_start
+        ;;
+    restart|reload|force-reload)
+        echo "error: '$0 $1' not supported"
+        exit 1
+        ;;
+    stop)
+        ;;
     *)
+        echo "Usage: $0 start|stop|restart|reload|force-reload"
+        exit 1
         ;;
 esac
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs	2005-11-12 13:09:50 UTC (rev 113)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs	2005-11-12 14:02:29 UTC (rev 114)
@@ -27,10 +27,18 @@
 }
 
 case "$1" in
+    start)
+        ;;
+    restart|reload|force-reload)
+        echo "error: '$0 $1' not supported"
+        exit 1
+        ;;
     stop)
-    	do_stop
-	;;
+        do_stop
+        ;;
     *)
+        echo "Usage: $0 start|stop|restart|reload|force-reload"
+        exit 1
         ;;
 esac
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/single
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/single	2005-11-12 13:09:50 UTC (rev 113)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/single	2005-11-12 14:02:29 UTC (rev 114)
@@ -40,8 +40,16 @@
 
 case "$1" in
     start)
-    	do_start
-	;;
+        do_start
+        ;;
+    restart|reload|force-reload)
+        echo "error: '$0 $1' not supported"
+        exit 1
+        ;;
+    stop)
+        ;;
     *)
+        echo "Usage: $0 start|stop|restart|reload|force-reload"
+        exit 1
         ;;
 esac

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2005-11-12 13:09:50 UTC (rev 113)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2005-11-12 14:02:29 UTC (rev 114)
@@ -51,10 +51,18 @@
 }
 
 case "$1" in
+    start)
+        ;;
+    restart|reload|force-reload)
+        echo "error: '$0 $1' not supported"
+        exit 1
+        ;;
     stop)
-    	do_stop
-	;;
+        do_stop
+        ;;
     *)
+        echo "Usage: $0 start|stop|restart|reload|force-reload"
+        exit 1
         ;;
 esac
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2005-11-12 13:09:50 UTC (rev 113)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2005-11-12 14:02:29 UTC (rev 114)
@@ -79,10 +79,18 @@
 }
 
 case "$1" in
+    start)
+        ;;
+    restart|reload|force-reload)
+        echo "error: '$0 $1' not supported"
+        exit 1
+        ;;
     stop)
-    	do_stop
-	;;
+        do_stop
+        ;;
     *)
+        echo "Usage: $0 start|stop|restart|reload|force-reload"
+        exit 1
         ;;
 esac
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountroot
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountroot	2005-11-12 13:09:50 UTC (rev 113)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountroot	2005-11-12 14:02:29 UTC (rev 114)
@@ -26,10 +26,18 @@
 }
 
 case "$1" in
+    start)
+        ;;
+    restart|reload|force-reload)
+        echo "error: '$0 $1' not supported"
+        exit 1
+        ;;
     stop)
-    	do_stop
-	;;
+        do_stop
+        ;;
     *)
+        echo "Usage: $0 start|stop|restart|reload|force-reload"
+        exit 1
         ;;
 esac
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/urandom
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/urandom	2005-11-12 13:09:50 UTC (rev 113)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/urandom	2005-11-12 14:02:29 UTC (rev 114)
@@ -62,6 +62,10 @@
 		ES=$?
 		[ "$VERBOSE" != no ] && log_end_msg $ES
 		;;
+        restart|reload|force-reload)
+        	echo "error: '$0 $1' not supported"
+		exit 1
+		;;
 	*)
 		echo "Usage: urandom {start|stop}" >&2
 		exit 1