Author: aurel32
Date: 2010-05-24 16:45:48 +0000 (Mon, 24 May 2010)
New Revision: 4282
Modified:
glibc-package/branches/eglibc-2.11/debian/changelog
glibc-package/branches/eglibc-2.11/debian/debhelper.in/nscd.init
Log:
* Explictely call /sbin/start-stop-daemon in nscd.init. Closes: bug#575404.
Modified: glibc-package/branches/eglibc-2.11/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/changelog 2010-05-24 16:42:57 UTC
(rev 4281)
+++ glibc-package/branches/eglibc-2.11/debian/changelog 2010-05-24 16:45:48 UTC
(rev 4282)
@@ -76,6 +76,7 @@
makecontext() on s390.
* Replace debian/patches/submitted/cvs-stat-issock.diff by the upstream patch
debian/patches/any/cvs-stat-issock.diff.
+ * Explictely call /sbin/start-stop-daemon in nscd.init. Closes: bug#575404.
[ Samuel Thibault ]
* debian/patches/hurd-i386/submitted-rtld_lock_recursive.diff: New patch to
@@ -92,7 +93,7 @@
* Add kfreebsd/local-dosavesse.diff, which does not work,
so rather use also added kfreebsd/local-nosavesse.diff
- -- Aurelien Jarno <[email protected]> Mon, 24 May 2010 17:30:33 +0200
+ -- Aurelien Jarno <[email protected]> Mon, 24 May 2010 18:45:18 +0200
eglibc (2.10.2-9) unstable; urgency=low
Modified: glibc-package/branches/eglibc-2.11/debian/debhelper.in/nscd.init
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/debhelper.in/nscd.init
2010-05-24 16:42:57 UTC (rev 4281)
+++ glibc-package/branches/eglibc-2.11/debian/debhelper.in/nscd.init
2010-05-24 16:45:48 UTC (rev 4282)
@@ -34,8 +34,8 @@
# Return
# 0 if daemon has been started or was already running
# 2 if daemon could not be started
- 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
+ /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
}
stop_nscd()
@@ -49,13 +49,13 @@
# in that case, fallback to "good old methods"
RETVAL=0
if ! $DAEMON --shutdown; then
- start-stop-daemon --stop --quiet --pidfile "$PIDFILE" --name
"$NAME" --test > /dev/null
+ /sbin/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
- start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec
"$DAEMON" > /dev/null
+ /sbin/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
- start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON"
--test > /dev/null || return 1
+ /sbin/start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec
"$DAEMON" --test > /dev/null || return 1
return 0
}
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
