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

[Thomas Hood]

Author: jdthood-guest
Date: 2005-11-24 12:18:10 +0000 (Thu, 24 Nov 2005)
New Revision: 233

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/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/umountnfs.sh
Log:
Make .sh scripts work even when not given any arguments

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-11-24 12:11:04 UTC (rev 232)
+++ sysvinit/trunk/debian/changelog	2005-11-24 12:18:10 UTC (rev 233)
@@ -6,6 +6,8 @@
   * Make sure to source *.sh scripts for runlevel 'S'.  (Closes: #339955)
 
   [ Thomas Hood ]
+  * *.sh: Make sure that these do their thing when they aren't given any
+    command line arguments (as is the case when they are sourced)
   * checkroot.sh: Fix double printing of 'Done checking root file system';
     mountall.sh: Fix chopped-up printing of mount information
     (Closes: #339979 and presumably closes: #332309)

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh	2005-11-24 12:11:04 UTC (rev 232)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh	2005-11-24 12:18:10 UTC (rev 233)
@@ -68,7 +68,7 @@
 }
 
 case "$1" in
-  start)
+  start|"")
 	do_start
 	;;
   restart|reload|force-reload)
@@ -79,7 +79,7 @@
 	# No-op
 	;;
   *)
-	echo "Usage: bootmisc.sh start|stop" >&2
+	echo "Usage: bootmisc.sh [start|stop]" >&2
 	exit 3
 	;;
 esac

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2005-11-24 12:11:04 UTC (rev 232)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2005-11-24 12:18:10 UTC (rev 233)
@@ -78,7 +78,7 @@
 }
 
 case "$1" in
-  start)
+  start|"")
 	do_start
 	;;
   restart|reload|force-reload)
@@ -89,7 +89,7 @@
 	# No-op
 	;;
   *)
-	echo "Usage: checkfs.sh start|stop" >&2
+	echo "Usage: checkfs.sh [start|stop]" >&2
 	exit 3
 	;;
 esac

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-11-24 12:11:04 UTC (rev 232)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-11-24 12:18:10 UTC (rev 233)
@@ -345,7 +345,7 @@
 }
 
 case "$1" in
-  start)
+  start|"")
 	do_start
 	;;
   restart|reload|force-reload)
@@ -356,7 +356,7 @@
 	# No-op
 	;;
   *)
-	echo "Usage: checkroot.sh start|stop" >&2
+	echo "Usage: checkroot.sh [start|stop]" >&2
 	exit 3
 	;;
 esac

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/hostname.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/hostname.sh	2005-11-24 12:11:04 UTC (rev 232)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/hostname.sh	2005-11-24 12:18:10 UTC (rev 233)
@@ -26,7 +26,7 @@
 }
 
 case "$1" in
-  start)
+  start|"")
 	do_start
 	;;
   restart|reload|force-reload)
@@ -37,7 +37,7 @@
 	# No-op
 	;;
   *)
-	echo "Usage: hostname.sh start|stop" >&2
+	echo "Usage: hostname.sh [start|stop]" >&2
 	exit 3
 	;;
 esac

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2005-11-24 12:11:04 UTC (rev 232)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2005-11-24 12:18:10 UTC (rev 233)
@@ -79,7 +79,7 @@
 }
 
 case "$1" in
-  start)
+  start|"")
 	do_start
 	;;
   restart|reload|force-reload)
@@ -90,7 +90,7 @@
 	# No-op
 	;;
   *)
-	echo "Usage: mountall.sh start|stop" >&2
+	echo "Usage: mountall.sh [start|stop]" >&2
 	exit 3
 	;;
 esac

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh	2005-11-24 12:11:04 UTC (rev 232)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh	2005-11-24 12:18:10 UTC (rev 233)
@@ -105,7 +105,7 @@
 }
 
 case "$1" in
-  start)
+  start|"")
 	do_start
 	;;
   restart|reload|force-reload)
@@ -116,7 +116,7 @@
 	# No-op
 	;;
   *)
-	echo "Usage: mountnfs.sh start|stop" >&2
+	echo "Usage: mountnfs.sh [start|stop]" >&2
 	exit 3
 	;;
 esac

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2005-11-24 12:11:04 UTC (rev 232)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2005-11-24 12:18:10 UTC (rev 233)
@@ -78,11 +78,11 @@
 	echo "Error: argument '$1' not supported" >&2
 	exit 3
 	;;
-  stop)
+  stop|"")
 	do_stop
 	;;
   *)
-	echo "Usage: umountnfs.sh start|stop" >&2
+	echo "Usage: umountnfs.sh [start|stop]" >&2
 	exit 3
 	;;
 esac