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

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-12 10:57:11 +0000 (Thu, 12 Jan 2006)
New Revision: 623

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
Log:
Only sleep 1 second if we start portmap; start it with oknodo

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-01-12 10:47:11 UTC (rev 622)
+++ sysvinit/trunk/debian/changelog	2006-01-12 10:57:11 UTC (rev 623)
@@ -7,6 +7,8 @@
     subshells; add comments
   * mountall.sh: Eliminate unnecessary check for pre-2.4 Linux kernel
   * mountnfs.sh, mountall.sh: Choose different names for intnl. functions
+  * mountnfs.sh: Only sleep 1 second after starting portmap; note that
+    the code to start portmap will disappear someday
   * various scripts: Make more messages depend on VERBOSE being != "no"
   * various scripts: Handle return status more carefully
   * various scripts: Eliminate unnecessary uses of subshell

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh	2006-01-12 10:47:11 UTC (rev 622)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh	2006-01-12 10:57:11 UTC (rev 623)
@@ -87,9 +87,9 @@
 				/etc/init.d/portmap start
 			else
 				log_action_begin_msg "Starting portmap"
-				start-stop-daemon --start --quiet --exec /sbin/portmap
+				start-stop-daemon --start --quiet --oknodo --exec /sbin/portmap
 				ES=$?
-				sleep 2  # FIXME: Actually synchronize with the process?
+				sleep 1  # FIXME: Actually synchronize with the process?
 				log_action_end_msg $ES
 			fi
 		fi