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

[Petter Reinholdtsen]

Author: pere
Date: 2010-03-21 18:27:33 +0000 (Sun, 21 Mar 2010)
New Revision: 1843

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/src/sysv-rc/sbin/invoke-rc.d
Log:
Always print message from invoke-rc.d when policy-rc.d denied
execution (Closes: #566783).  Patch from Per Wawra.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-03-21 14:31:26 UTC (rev 1842)
+++ sysvinit/trunk/debian/changelog	2010-03-21 18:27:33 UTC (rev 1843)
@@ -6,6 +6,8 @@
     Scott James Remnant and Ubuntu.
   * Change service to use upstart for service management if an upstart
     configuration exist.  Patch from Dustin Kirkland and Ubuntu.
+  * Always print message from invoke-rc.d when policy-rc.d denied
+    execution (Closes: #566783).  Patch from Per Wawra.
 
   [ Kel Modderman ]
   * Exit with value rather than echo the value for the status action in

Modified: sysvinit/trunk/debian/src/sysv-rc/sbin/invoke-rc.d
===================================================================
--- sysvinit/trunk/debian/src/sysv-rc/sbin/invoke-rc.d	2010-03-21 14:31:26 UTC (rev 1842)
+++ sysvinit/trunk/debian/src/sysv-rc/sbin/invoke-rc.d	2010-03-21 18:27:33 UTC (rev 1843)
@@ -138,6 +138,8 @@
 	101) if test x${FORCE} != x ; then
 		printerror Overriding policy-rc.d denied execution of ${printaction}.
 		RC=104
+	     else
+		printerror policy-rc.d denied execution of ${printaction}.
 	     fi
 	     ;;
     esac