[Pkg-sysvinit-commits] r1785 - in sysvinit/trunk/debian: . src/sysv-rc/man8 src/sysv-rc/sbin

[Henrique de Moraes Holschuh]

Author: hmh
Date: 2009-09-22 03:07:25 +0000 (Tue, 22 Sep 2009)
New Revision: 1785

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/src/sysv-rc/man8/invoke-rc.d.8
   sysvinit/trunk/debian/src/sysv-rc/sbin/invoke-rc.d
Log:
* invoke-rc.d: return exit status 4 when action "status" is denied,
to allow simpleminded policy-rc.d scripts to work well with the status
action (closes: #381497)


Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-09-20 17:27:48 UTC (rev 1784)
+++ sysvinit/trunk/debian/changelog	2009-09-22 03:07:25 UTC (rev 1785)
@@ -1,5 +1,6 @@
 sysvinit (2.87dsf-7) UNRELEASED; urgency=low
 
+  [ Petter Reinholdtsen ]
   * Change if-up.d/mountnfs to not claim to wait for the last network
     interface when there are no network file systems listed in
     /etc/fstab (Closes: #512237, 481028).  Patch from Adrian Bridgett.
@@ -10,8 +11,13 @@
   * Report error from update-rc.d when insserv reject a script, to
     make it more clear what program call failed in a postinst.
 
- -- Petter Reinholdtsen <pere at debian.org>  Fri, 18 Sep 2009 22:12:48 +0200
+  [ Henrique de Moraes Holschuh ]
+  * invoke-rc.d: return exit status 4 when action "status" is denied,
+    to allow simpleminded policy-rc.d scripts to work well with the
+    status action (closes: #381497)
 
+ -- Henrique de Moraes Holschuh <hmh at debian.org>  Tue, 22 Sep 2009 00:03:15 -0300
+
 sysvinit (2.87dsf-6) unstable; urgency=low
 
   * Correct code in sysv-rc postinst to avoid failing to install when no

Modified: sysvinit/trunk/debian/src/sysv-rc/man8/invoke-rc.d.8
===================================================================
--- sysvinit/trunk/debian/src/sysv-rc/man8/invoke-rc.d.8	2009-09-20 17:27:48 UTC (rev 1784)
+++ sysvinit/trunk/debian/src/sysv-rc/man8/invoke-rc.d.8	2009-09-22 03:07:25 UTC (rev 1785)
@@ -208,6 +208,13 @@
 System V runlevel configuration (if the sysv-rc package is
 not being used).
 
+.SH NOTES
+.B invoke\-rc.d
+special cases the
+.I status
+action, and returns exit status 4 instead of exit status 0 when
+it is denied.
+
 .SH BUGS
 Please report any bugs using the Debian bug tracking system,
 http://bugs.debian.org/, packages sysv\-rc or file\-rc 

Modified: sysvinit/trunk/debian/src/sysv-rc/sbin/invoke-rc.d
===================================================================
--- sysvinit/trunk/debian/src/sysv-rc/sbin/invoke-rc.d	2009-09-20 17:27:48 UTC (rev 1784)
+++ sysvinit/trunk/debian/src/sysv-rc/sbin/invoke-rc.d	2009-09-22 03:07:25 UTC (rev 1785)
@@ -445,9 +445,14 @@
     exit 102
 fi
 
-## Handles --disclose-deny
+## Handles --disclose-deny and denied "status" action (bug #381497)
 if test ${RC} -eq 101 && test x${RETURNFAILURE} = x ; then
-    RC=0
+    if test "x${ACTION%% *}" = "xstatus"; then
+	printerror emulating initscript action \"status\", returning \"unknown\"
+	RC=4
+    else
+        RC=0
+    fi
 else
     formataction ${ACTION}
     printerror initscript ${naction} \"${printaction}\" not executed.