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

Thomas Hood jdthood-guest at costa.debian.org
Tue Jan 17 21:09:27 UTC 2006 

Author: jdthood-guest
Date: 2006-01-17 21:09:26 +0000 (Tue, 17 Jan 2006)
New Revision: 672

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/10_doc_manuals.dpatch
Log:
Fix #186880

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-01-17 18:56:03 UTC (rev 671)
+++ sysvinit/trunk/debian/changelog	2006-01-17 21:09:26 UTC (rev 672)
@@ -5,6 +5,7 @@
 
   [ Thomas Hood ]
   * rcS(5): Improve
+  * sulogin(8): Improve; mention -t option  (Closes: #186880)
   * bootlogd(8): Improve; mention need for PTY support
   * initscripts preinst and postinst: Update
   * initscripts: Harmonize PATH settings

Modified: sysvinit/trunk/debian/patches/10_doc_manuals.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/10_doc_manuals.dpatch	2006-01-17 18:56:03 UTC (rev 671)
+++ sysvinit/trunk/debian/patches/10_doc_manuals.dpatch	2006-01-17 21:09:26 UTC (rev 672)
@@ -7,9 +7,9 @@
 ## DP: init.8: Mention that entering runlevel 1 kills all processes (Closes: #238861)
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./man/bootlogd.8 /tmp/dpep-work.ns8y4d/trunk/man/bootlogd.8
+diff -urNad --exclude=CVS --exclude=.svn ./man/bootlogd.8 /tmp/dpep-work.ceRMyc/trunk/man/bootlogd.8
 --- ./man/bootlogd.8	2005-12-02 17:22:58.000000000 +0100
-+++ /tmp/dpep-work.ns8y4d/trunk/man/bootlogd.8	2006-01-16 13:53:53.000000000 +0100
++++ /tmp/dpep-work.ceRMyc/trunk/man/bootlogd.8	2006-01-17 21:54:33.000000000 +0100
 @@ -11,7 +11,7 @@
  .SH DESCRIPTION
  \fBBootlogd\fP runs in the background and copies all strings sent to the
@@ -51,9 +51,9 @@
  .SH AUTHOR
  Miquel van Smoorenburg, miquels at cistron.nl
  .SH "SEE ALSO"
-diff -urNad --exclude=CVS --exclude=.svn ./man/init.8 /tmp/dpep-work.ns8y4d/trunk/man/init.8
+diff -urNad --exclude=CVS --exclude=.svn ./man/init.8 /tmp/dpep-work.ceRMyc/trunk/man/init.8
 --- ./man/init.8	2005-12-02 17:22:58.000000000 +0100
-+++ /tmp/dpep-work.ns8y4d/trunk/man/init.8	2006-01-16 13:53:32.000000000 +0100
++++ /tmp/dpep-work.ceRMyc/trunk/man/init.8	2006-01-17 21:54:33.000000000 +0100
 @@ -36,21 +36,34 @@
  only a selected group of processes to exist.  The processes spawned by
  \fBinit\fP for each of these runlevels are defined in the
@@ -125,9 +125,9 @@
  .\"}}}
  .\"{{{  Diagnostics
  .SH DIAGNOSTICS
-diff -urNad --exclude=CVS --exclude=.svn ./man/last.1 /tmp/dpep-work.ns8y4d/trunk/man/last.1
+diff -urNad --exclude=CVS --exclude=.svn ./man/last.1 /tmp/dpep-work.ceRMyc/trunk/man/last.1
 --- ./man/last.1	2005-12-02 17:22:58.000000000 +0100
-+++ /tmp/dpep-work.ns8y4d/trunk/man/last.1	2006-01-16 13:53:32.000000000 +0100
++++ /tmp/dpep-work.ceRMyc/trunk/man/last.1	2006-01-17 21:54:33.000000000 +0100
 @@ -51,6 +51,8 @@
  .\"}}}
  .\"{{{  Options
@@ -137,9 +137,9 @@
  .IP \fB\-\fP\fInum\fP
  This is a count telling \fBlast\fP how many lines to show.
  .IP "\fB\-n\fP \fInum\fP"
-diff -urNad --exclude=CVS --exclude=.svn ./man/mesg.1 /tmp/dpep-work.ns8y4d/trunk/man/mesg.1
+diff -urNad --exclude=CVS --exclude=.svn ./man/mesg.1 /tmp/dpep-work.ceRMyc/trunk/man/mesg.1
 --- ./man/mesg.1	2005-12-02 17:22:58.000000000 +0100
-+++ /tmp/dpep-work.ns8y4d/trunk/man/mesg.1	2006-01-16 13:53:32.000000000 +0100
++++ /tmp/dpep-work.ceRMyc/trunk/man/mesg.1	2006-01-17 21:54:33.000000000 +0100
 @@ -26,7 +26,9 @@
  .PP
  If no option is given, \fBmesg\fP prints out the current access state of your
@@ -151,9 +151,9 @@
  \fBMesg\fP assumes that its standard input is connected to your
  terminal. That also means that if you are logged in multiple times,
  you can get/set the mesg status of other sessions by using redirection.
-diff -urNad --exclude=CVS --exclude=.svn ./man/pidof.8 /tmp/dpep-work.ns8y4d/trunk/man/pidof.8
+diff -urNad --exclude=CVS --exclude=.svn ./man/pidof.8 /tmp/dpep-work.ceRMyc/trunk/man/pidof.8
 --- ./man/pidof.8	2005-12-02 17:22:58.000000000 +0100
-+++ /tmp/dpep-work.ns8y4d/trunk/man/pidof.8	2006-01-16 13:53:32.000000000 +0100
++++ /tmp/dpep-work.ceRMyc/trunk/man/pidof.8	2006-01-17 21:54:33.000000000 +0100
 @@ -31,6 +31,13 @@
  Tells \fIpidof\fP to omit processes with that process id. The special
  pid \fB%PPID\fP can be used to name the parent process of the \fIpidof\fP
@@ -168,9 +168,9 @@
  .SH NOTES
  \fIpidof\fP is simply a (symbolic) link to the \fIkillall5\fP program,
  which should also be located in \fP/sbin\fP.
-diff -urNad --exclude=CVS --exclude=.svn ./man/shutdown.8 /tmp/dpep-work.ns8y4d/trunk/man/shutdown.8
+diff -urNad --exclude=CVS --exclude=.svn ./man/shutdown.8 /tmp/dpep-work.ceRMyc/trunk/man/shutdown.8
 --- ./man/shutdown.8	2005-12-02 17:22:58.000000000 +0100
-+++ /tmp/dpep-work.ns8y4d/trunk/man/shutdown.8	2006-01-16 13:53:32.000000000 +0100
++++ /tmp/dpep-work.ceRMyc/trunk/man/shutdown.8	2006-01-17 21:54:33.000000000 +0100
 @@ -100,10 +100,11 @@
  Second, it can be in the format \fB+\fP\fIm\fP, in which \fIm\fP is the
  number of minutes to wait.  The word \fBnow\fP is an alias for \fB+0\fP.
@@ -185,3 +185,96 @@
  can signal init (i.e. it is cancelled or something goes wrong).
  It also removes it before calling init to change the runlevel.
  .PP
+diff -urNad --exclude=CVS --exclude=.svn ./man/sulogin.8 /tmp/dpep-work.ceRMyc/trunk/man/sulogin.8
+--- ./man/sulogin.8	2005-12-02 17:22:58.000000000 +0100
++++ /tmp/dpep-work.ceRMyc/trunk/man/sulogin.8	2006-01-17 22:07:42.000000000 +0100
+@@ -1,53 +1,60 @@
+-.TH SULOGIN 8 "04 Nov 2003" "" "Linux System Administrator's Manual"
++.TH SULOGIN 8 "17 Jan 2006" "" "Linux System Administrator's Manual"
+ .SH NAME
+-sulogin -- Single-user login
++sulogin \- Single-user login
+ .SH SYNOPSIS
+ .B sulogin
+-.RB [ " -e " ]
+-.RB [ " -p " ]
+-.RB [ " -t timeout " ]
+-.RB [ " tty-device " ]
++[ \fB\-e\fP ]
++[ \fB\-p\fP ]
++[ \fB\-t\fP \fISECONDS\fP ]
++[ \fITTY\fP ]
+ .SH DESCRIPTION
+ .I sulogin
+-is invoked by \fBinit(8)\fP when the system goes into single user mode
+-(this is done through an entry in \fIinittab(5)\fP). \fBInit\fP also
+-tries to execute \fIsulogin\fP when it is passed the \fB-b\fP flag
+-from the bootmonitor (eg, LILO).
++is invoked by \fBinit(8)\fP when the system goes into single user mode.
++(This is done through an entry in \fIinittab(5)\fP.)
++\fBInit\fP also
++tries to execute \fIsulogin\fP when
++the boot loader (e.g., \fBgrub\fP(8))
++passes it the \fB\-b\fP option.
+ .PP
+ The user is prompted
+ .IP "" .5i
+ Give root password for system maintenance
+ .br
+-(or type Control-D for normal startup):
++(or type Control\-D for normal startup):
+ .PP
+ \fIsulogin\fP will be connected to the current terminal, or to the
+ optional device that can be specified on the command line
+ (typically \fB/dev/console\fP).
+ .PP
+-If the \fB-p\fP flag was set, the single-user shell will be invoked
+-with a \fIdash\fP as the first character in \fIargv[0]\fP. That will
+-cause most shells to behave as a login shell. The default is \fInot\fP
+-to do this, so that the shell will \fInot\fP read \fB/etc/profile\fP
++If the \fB\-t\fP option is used then the program only waits
++the given number of seconds for user input.
++.PP
++If the \fB\-p\fP option is used then the single-user shell is invoked
++with a \fIdash\fP as the first character in \fIargv[0]\fP.
++This causes the shell process to behave as a login shell.
++The default is \fInot\fP to do this,
++so that the shell will \fInot\fP read \fB/etc/profile\fP
+ or \fB$HOME/.profile\fP at startup.
+ .PP
+-After the user exits the single-user shell, or presses control-d at the
+-prompt, the system will (continue to) boot to the default runlevel.
++After the user exits the single-user shell,
++or presses control\-D at the prompt,
++the system will (continue to) boot to the default runlevel.
+ .SH ENVIRONMENT VARIABLES
+ \fIsulogin\fP looks for the environment variable \fBSUSHELL\fP or
+ \fBsushell\fP to determine what shell to start. If the environment variable
+ is not set, it will try to execute root's shell from /etc/passwd. If that
+ fails it will fall back to \fB/bin/sh\fP.
+ .PP
+-This is very valuable together with the \fB-b\fP flag to init. To boot
++This is very valuable together with the \fB\-b\fP option to init. To boot
+ the system into single user mode, with the root file system mounted read/write,
+ using a special "failsafe" shell that is statically linked (this example
+ is valid for the LILO bootprompt)
+ .PP
+-boot: linux -b rw sushell=/sbin/sash
++boot: linux \-b rw sushell=/sbin/sash
+ .SH FALLBACK METHODS
+ \fIsulogin\fP checks the root password using the standard method (getpwnam)
+ first.
+-Then, if the \fB-e\fP option was specified,
++Then, if the \fB\-e\fP option was specified,
+ \fIsulogin\fP examines these files directly to find the root password:
+ .PP
+ /etc/passwd,
+@@ -55,7 +62,7 @@
+ /etc/shadow (if present)
+ .PP
+ If they are damaged or non-existant, sulogin will start a root shell
+-without asking for a password. Only use the \fB-e\fP option if you
++without asking for a password. Only use the \fB\-e\fP option if you
+ are sure the console is physically protected against unauthorized access.
+ .SH AUTHOR
+ Miquel van Smoorenburg <miquels at cistron.nl>

More information about the Pkg-sysvinit-commits mailing list