[Glibc-bsd-commits] r4387 - trunk/freebsd-utils/debian

[Steven Chamberlain]

Author: stevenc-guest
Date: 2013-03-27 13:40:59 +0000 (Wed, 27 Mar 2013)
New Revision: 4387

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/freebsd-nfs-common.rpc.lockd.init
   trunk/freebsd-utils/debian/freebsd-nfs-common.rpc.statd.init
   trunk/freebsd-utils/debian/freebsd-nfs-server.nfsd.init
Log:
* Don't use --pidfile when starting/stopping daemons that don't create one:
  - Prevents trying to start nfsd, rpc.lockd, rpc.statd more than once
    (Closes: #700245)
  - Fixes a 30-second delay as each service is stopped (Closes: #700249)
* Stop nfsd with the correct signal USR1, since it ignores TERM


Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2013-03-18 11:06:52 UTC (rev 4386)
+++ trunk/freebsd-utils/debian/changelog	2013-03-27 13:40:59 UTC (rev 4387)
@@ -1,3 +1,13 @@
+freebsd-utils (9.0+ds1-11) UNRELEASED; urgency=low
+
+  * Don't use --pidfile when starting/stopping daemons that don't create one:
+    - Prevents trying to start nfsd, rpc.lockd, rpc.statd more than once
+      (Closes: #700245)
+    - Fixes a 30-second delay as each service is stopped (Closes: #700249)
+  * Stop nfsd with the correct signal USR1, since it ignores TERM
+
+ -- Steven Chamberlain <steven at pyro.eu.org>  Wed, 27 Mar 2013 13:16:03 +0000
+
 freebsd-utils (9.0+ds1-10) unstable; urgency=low
 
   * Import patch by Steven Chamberlain to make rpc.lockd start without

Modified: trunk/freebsd-utils/debian/freebsd-nfs-common.rpc.lockd.init
===================================================================
--- trunk/freebsd-utils/debian/freebsd-nfs-common.rpc.lockd.init	2013-03-18 11:06:52 UTC (rev 4386)
+++ trunk/freebsd-utils/debian/freebsd-nfs-common.rpc.lockd.init	2013-03-27 13:40:59 UTC (rev 4387)
@@ -38,9 +38,9 @@
 	#   0 if daemon has been started
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+	start-stop-daemon --start --quiet --exec $DAEMON --test > /dev/null \
 		|| return 1
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+	start-stop-daemon --start --quiet --exec $DAEMON -- \
 		$DAEMON_ARGS \
 		|| return 2
 	# Add code here, if necessary, that waits for the process to be ready
@@ -58,7 +58,7 @@
 	#   1 if daemon was already stopped
 	#   2 if daemon could not be stopped
 	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name $NAME
 	RETVAL="$?"
 	[ "$RETVAL" = 2 ] && return 2
 	# Wait for children to finish too if this is a daemon that forks

Modified: trunk/freebsd-utils/debian/freebsd-nfs-common.rpc.statd.init
===================================================================
--- trunk/freebsd-utils/debian/freebsd-nfs-common.rpc.statd.init	2013-03-18 11:06:52 UTC (rev 4386)
+++ trunk/freebsd-utils/debian/freebsd-nfs-common.rpc.statd.init	2013-03-27 13:40:59 UTC (rev 4387)
@@ -40,9 +40,9 @@
 	#   0 if daemon has been started
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+	start-stop-daemon --start --quiet --exec $DAEMON --test > /dev/null \
 		|| return 1
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+	start-stop-daemon --start --quiet --exec $DAEMON -- \
 		$DAEMON_ARGS \
 		|| return 2
 	# Add code here, if necessary, that waits for the process to be ready
@@ -60,7 +60,7 @@
 	#   1 if daemon was already stopped
 	#   2 if daemon could not be stopped
 	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name $NAME
 	RETVAL="$?"
 	[ "$RETVAL" = 2 ] && return 2
 	# Wait for children to finish too if this is a daemon that forks

Modified: trunk/freebsd-utils/debian/freebsd-nfs-server.nfsd.init
===================================================================
--- trunk/freebsd-utils/debian/freebsd-nfs-server.nfsd.init	2013-03-18 11:06:52 UTC (rev 4386)
+++ trunk/freebsd-utils/debian/freebsd-nfs-server.nfsd.init	2013-03-27 13:40:59 UTC (rev 4387)
@@ -44,9 +44,9 @@
 	#   0 if daemon has been started
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+	start-stop-daemon --start --quiet --exec $DAEMON --test > /dev/null \
 		|| return 1
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+	start-stop-daemon --start --quiet --exec $DAEMON -- \
 		$DAEMON_ARGS \
 		|| return 2
 	# Add code here, if necessary, that waits for the process to be ready
@@ -64,7 +64,7 @@
 	#   1 if daemon was already stopped
 	#   2 if daemon could not be stopped
 	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+	start-stop-daemon --stop --quiet --retry=USR1/30/KILL/5 --name $NAME
 	RETVAL="$?"
 	[ "$RETVAL" = 2 ] && return 2
 	# Wait for children to finish too if this is a daemon that forks