[Pkg-sysvinit-commits] r107 - in sysvinit/trunk/debian: . patches

[Petter Reinholdtsen]

Author: pere
Date: 2005-11-12 11:20:38 +0000 (Sat, 12 Nov 2005)
New Revision: 107

Added:
   sysvinit/trunk/debian/patches/90_shutdown_H.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/00list
Log:
  * Added 90_shutdown_h.dpatch to make sure shutdown flags -P and -H
    require the -h flag, and document this in the manual page.
    (Closes: #331041)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-11-12 10:50:29 UTC (rev 106)
+++ sysvinit/trunk/debian/changelog	2005-11-12 11:20:38 UTC (rev 107)
@@ -12,6 +12,9 @@
   * Get update-rc.d to understand symlinks to /etc/init.d/ as well as
     symlinks to ../init.d/. (Closes: #338666)
   * Adjust and clean up init.d dependecy information.
+  * Added 90_shutdown_h.dpatch to make sure shutdown flags -P and -H
+    require the -h flag, and document this in the manual page.
+    (Closes: #331041)
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat,  8 Oct 2005 17:08:47 +0200
 

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2005-11-12 10:50:29 UTC (rev 106)
+++ sysvinit/trunk/debian/patches/00list	2005-11-12 11:20:38 UTC (rev 107)
@@ -15,3 +15,4 @@
 70_wall_ttyname
 80_killall_sched
 81_killall_avoid_init
+90_shutdown_H

Added: sysvinit/trunk/debian/patches/90_shutdown_H.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/90_shutdown_H.dpatch	2005-11-12 10:50:29 UTC (rev 106)
+++ sysvinit/trunk/debian/patches/90_shutdown_H.dpatch	2005-11-12 11:20:38 UTC (rev 107)
@@ -0,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_shutdown_H.dpatch by Petter Reinholdtsen
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make sure shutdown flags -H and -P are only given with -h flag,
+## DP: and document this requirement in the manual page.  Fixes bug
+## DP: #331041.
+
+ at DPATCH@
+Index: sysvinit/src/shutdown.c
+===================================================================
+--- sysvinit/src/shutdown.c	(revisjon 100)
++++ sysvinit/src/shutdown.c	(arbeidskopi)
+@@ -521,6 +521,12 @@
+   		}
+ 	}
+ 
++	if (NULL != halttype && down_level[0] != '0') {
++		fprintf(stderr, "shutdown: -H and -P flags needs -h flag.\n");
++		usage();
++  		exit(1);
++	}
++
+ 	/* Do we need to use the shutdown.allow file ? */
+ 	if (useacl && (fp = fopen(SDALLOW, "r")) != NULL) {
+ 
+Index: sysvinit/man/shutdown.8
+===================================================================
+--- sysvinit/man/shutdown.8	(revisjon 100)
++++ sysvinit/man/shutdown.8	(arbeidskopi)
+@@ -54,12 +54,12 @@
+ .\"}}}
+ .\"{{{  -h
+ .IP \fB\-h\fP
+-Halt or poweroff after shutdown.
++Halt or poweroff after shutdown.  Must be used with the -h flag.
+ .\"}}}
+ .\"{{{  -H
+ .IP \fB\-H\fP
+-Halt action is to halt or drop into boot monitor on systems that
+-support it.
++Modifier to the -h flag.  Halt action is to halt or drop into boot
++monitor on systems that support it.  Must be used with the -h flag.
+ .\"}}}
+ .\"{{{  -P
+ .IP \fB\-P\fP


Property changes on: sysvinit/trunk/debian/patches/90_shutdown_H.dpatch
___________________________________________________________________
Name: svn:executable
   + *