[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r4144 - in glibc-package/trunk/debian: . script.in



Author: aurel32
Date: 2010-02-07 15:09:02 +0000 (Sun, 07 Feb 2010)
New Revision: 4144

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/script.in/nsscheck.sh
Log:
  * debian/script.in/nsscheck.sh: Only restart services that are currently 
    running.  Closes: #528755.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2010-02-07 14:35:34 UTC (rev 4143)
+++ glibc-package/trunk/debian/changelog	2010-02-07 15:09:02 UTC (rev 4144)
@@ -16,6 +16,8 @@
     patches/any/submitted-stack-guard-quick-randomization.diff from Ubuntu and
     Fedora to improve stack randomisation.  Closes: #568488.
   * Update es_CR locale from Marcelo Magallon.  Closes: #567351.
+  * debian/script.in/nsscheck.sh: Only restart services that are currently 
+    running.  Closes: #528755.
 
   [ Samuel Thibault ]
   * patches/hurd-i386/local-pthread.diff: New hurd-only patch to provide
@@ -30,7 +32,7 @@
   * patches/hurd-i386/submitted-getnprocs.diff: New patch to add get_nprocs()
     and such weak aliases.
 
- -- Aurelien Jarno <aurel32@debian.org>  Sun, 07 Feb 2010 15:34:43 +0100
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 07 Feb 2010 16:08:26 +0100
 
 eglibc (2.10.2-5) unstable; urgency=low
 

Modified: glibc-package/trunk/debian/script.in/nsscheck.sh
===================================================================
--- glibc-package/trunk/debian/script.in/nsscheck.sh	2010-02-07 14:35:34 UTC (rev 4143)
+++ glibc-package/trunk/debian/script.in/nsscheck.sh	2010-02-07 15:09:02 UTC (rev 4144)
@@ -17,12 +17,10 @@
 	    rl=$(runlevel | sed 's/.*\ //')
 	    for service in $check; do
 	    	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		    # Should be "if invoke-rc.d ${service} status; then", but
-		    # it is not yet supported by all scripts
-		    invoke-rc.d --query ${service} start 2>/dev/null || status=$?
-		    if [ "$status" = "104" ] ; then
+	    	    invoke-rc.d ${service} status 2>/dev/null || status=$?
+	    	    if [ "$status" = "0" ] || [ "$status" = "1" ] ; then
 	    	    	services="$service $services"
-	    	    else
+	    	    elif [ "$status" = "100" ] ; then
 	    	    	echo "WARNING: init script for $service not found."
 	    	    fi
 	    	else


Reply to: