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

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-04 10:41:58 +0000 (Wed, 04 Jan 2006)
New Revision: 519

Added:
   sysvinit/trunk/debian/patches/65_init_u_in_06.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/00list
   sysvinit/trunk/debian/patches/13_doc_telinit.dpatch
Log:
Allow 'telinit u' in runlevels 0 and 6

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-01-03 21:38:31 UTC (rev 518)
+++ sysvinit/trunk/debian/changelog	2006-01-04 10:41:58 UTC (rev 519)
@@ -12,6 +12,8 @@
   * urandom: Set PATH so that find can be found  (Closes: #345273)
   * init: 64_init_set_PATH.dpatch: Set PATH if it's unset on re-exec
     (Closes: #345370)
+  * init: 65_init_u_in_06.dpatch: Allow 'telinit u' in runlevels 0, 6
+    (Closes: #345719)
   * Remount ro with -f on GNU/kFreeBSD  (Closes: #344547)
   * various scripts: Redirect which program's stderr to /dev/null since
     the GNU version prints an error message when the command is not

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2006-01-03 21:38:31 UTC (rev 518)
+++ sysvinit/trunk/debian/patches/00list	2006-01-04 10:41:58 UTC (rev 519)
@@ -17,6 +17,7 @@
 62_init_freebsdterm
 63_init_longer_procname
 64_init_set_PATH
+65_init_u_in_06
 70_wall_ttyname
 71_wall_hostname
 80_killall_sched

Modified: sysvinit/trunk/debian/patches/13_doc_telinit.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/13_doc_telinit.dpatch	2006-01-03 21:38:31 UTC (rev 518)
+++ sysvinit/trunk/debian/patches/13_doc_telinit.dpatch	2006-01-04 10:41:58 UTC (rev 519)
@@ -5,9 +5,9 @@
 ## DP: Document -e and -t option in telinit.  Fixes bug #272657.
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./man/init.8 /tmp/dpep-work.lAeEng/trunk/man/init.8
---- ./man/init.8	2006-01-03 22:17:04.000000000 +0100
-+++ /tmp/dpep-work.lAeEng/trunk/man/init.8	2006-01-03 22:18:31.000000000 +0100
+diff -urNad --exclude=CVS --exclude=.svn ./man/init.8 /tmp/dpep-work.onJlGf/trunk/man/init.8
+--- ./man/init.8	2006-01-04 11:37:18.000000000 +0100
++++ /tmp/dpep-work.onJlGf/trunk/man/init.8	2006-01-04 11:37:34.000000000 +0100
 @@ -12,12 +12,15 @@
  .RB [ " -a " ]
  .RB [ " -s " ]
@@ -26,8 +26,13 @@
  .\"}}}
  .\"{{{  Description
  .SH DESCRIPTION
-@@ -158,9 +161,17 @@
- \fB/etc/inittab\fP file happens. Run level should be one of \fBSs12345\fP,
+@@ -155,12 +158,21 @@
+ tell \fBinit\fP to switch to single user mode.
+ .IP "\fBU\fP or \fBu\fP"
+ tell \fBinit\fP to re-execute itself (preserving the state). No re-examining of 
+-\fB/etc/inittab\fP file happens. Run level should be one of \fBSs12345\fP,
++\fB/etc/inittab\fP file happens. Run level should be one of
++\fBSs12345\fP
  otherwise request would be silently ignored.
  .PP
 -\fBtelinit\fP can also tell \fBinit\fP how long it should wait
@@ -46,7 +51,7 @@
  .PP
  \fBtelinit\fP can be invoked only by users with appropriate
  privileges.
-@@ -212,8 +223,8 @@
+@@ -212,8 +224,8 @@
  command line manually.
  .PP
  .TP 0.5i
@@ -57,9 +62,9 @@
  line a bit, so that it takes some more space on the stack. \fBInit\fP
  can then manipulate the command line so that \fBps\fP(1) shows
  the current runlevel.
-diff -urNad --exclude=CVS --exclude=.svn ./src/init.c /tmp/dpep-work.lAeEng/trunk/src/init.c
+diff -urNad --exclude=CVS --exclude=.svn ./src/init.c /tmp/dpep-work.onJlGf/trunk/src/init.c
 --- ./src/init.c	2005-12-02 17:22:57.000000000 +0100
-+++ /tmp/dpep-work.lAeEng/trunk/src/init.c	2006-01-03 22:17:05.000000000 +0100
++++ /tmp/dpep-work.onJlGf/trunk/src/init.c	2006-01-04 11:37:19.000000000 +0100
 @@ -2495,7 +2495,7 @@
   */
  void usage(char *s)

Added: sysvinit/trunk/debian/patches/65_init_u_in_06.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/65_init_u_in_06.dpatch	2006-01-03 21:38:31 UTC (rev 518)
+++ sysvinit/trunk/debian/patches/65_init_u_in_06.dpatch	2006-01-04 10:41:58 UTC (rev 519)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 65_init_u_in_06.dpatch by Thomas Hood
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Allow 'telinit u' in runlevels 0 and 6
+
+ at DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./man/init.8 /tmp/dpep-work.ZhzV9R/trunk/man/init.8
+--- ./man/init.8	2006-01-04 11:38:11.000000000 +0100
++++ /tmp/dpep-work.ZhzV9R/trunk/man/init.8	2006-01-04 11:38:26.000000000 +0100
+@@ -159,7 +159,7 @@
+ .IP "\fBU\fP or \fBu\fP"
+ tell \fBinit\fP to re-execute itself (preserving the state). No re-examining of 
+ \fB/etc/inittab\fP file happens. Run level should be one of
+-\fBSs12345\fP
++\fBSs0123456\fP
+ otherwise request would be silently ignored.
+ .PP
+ \fBtelinit\fP can tell \fBinit\fP how long it should wait
+diff -urNad --exclude=CVS --exclude=.svn ./src/init.c /tmp/dpep-work.ZhzV9R/trunk/src/init.c
+--- ./src/init.c	2006-01-04 11:38:12.000000000 +0100
++++ /tmp/dpep-work.ZhzV9R/trunk/src/init.c	2006-01-04 11:38:12.000000000 +0100
+@@ -1996,7 +1996,7 @@
+ 	char		**env;
+ 	int		fd;
+ 
+-	if (strchr("S12345",runlevel) == NULL)
++	if (strchr("S0123456",runlevel) == NULL)
+ 		return;
+ 
+ 	/*


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