r4302 - in glibc-package/trunk/debian: . debhelper.in

[Aurelien Jarno <aurel32@alioth.debian.org>]

Author: aurel32
Date: 2010-05-30 11:06:34 +0000 (Sun, 30 May 2010)
New Revision: 4302

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/debhelper.in/nscd.init
Log:
  * nscd.init: don't use and absolute path to call start-stop-daemon, the
    PATH variable already take care of that.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2010-05-30 11:05:23 UTC (rev 4301)
+++ glibc-package/trunk/debian/changelog	2010-05-30 11:06:34 UTC (rev 4302)
@@ -1,3 +1,11 @@
+eglibc (2.11.1-2) UNRELEASED; urgency=low
+
+  [ Aurelien Jarno]
+  * nscd.init: don't use and absolute path to call start-stop-daemon, the
+    PATH variable already take care of that.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 30 May 2010 13:06:11 +0200
+
 eglibc (2.11.1-1) unstable; urgency=low
 
   [ Clint Adams ]

Modified: glibc-package/trunk/debian/debhelper.in/nscd.init
===================================================================
--- glibc-package/trunk/debian/debhelper.in/nscd.init	2010-05-30 11:05:23 UTC (rev 4301)
+++ glibc-package/trunk/debian/debhelper.in/nscd.init	2010-05-30 11:06:34 UTC (rev 4302)
@@ -34,8 +34,8 @@
 	# Return
 	#   0 if daemon has been started or was already running
 	#   2 if daemon could not be started
-	/sbin/start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" --test > /dev/null || return 0
-	/sbin/start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" || return 2
+	start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" --test > /dev/null || return 0
+	start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" || return 2
 }
 
 stop_nscd()
@@ -49,13 +49,13 @@
 	# in that case, fallback to "good old methods"
 	RETVAL=0
 	if ! $DAEMON --shutdown; then
-		/sbin/start-stop-daemon --stop --quiet --pidfile "$PIDFILE" --name "$NAME" --test > /dev/null
+		start-stop-daemon --stop --quiet --pidfile "$PIDFILE" --name "$NAME" --test > /dev/null
 		RETVAL="$?"
 		[ "$?" -ne 0  -a  "$?" -ne 1 ] && return 2
 	fi
 
 	# Wait for children to finish too
-	/sbin/start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec "$DAEMON" > /dev/null
+	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec "$DAEMON" > /dev/null
 	[ "$?" -ne 0  -a  "$?" -ne 1 ] && return 2
 	rm -f "$PIDFILE"
 	return "$RETVAL"
@@ -66,7 +66,7 @@
 	# Return
 	#   0 if daemon is stopped
 	#   1 if daemon is running
-	/sbin/start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" --test > /dev/null || return 1
+	start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" --test > /dev/null || return 1
 	return 0
 }