[Pkg-sysvinit-commits] r545 - in sysvinit/trunk/debian: . initscripts initscripts/share

Sun Jan 8 13:47:11 UTC 2006

Author: jdthood-guest
Date: 2006-01-08 13:47:11 +0000 (Sun, 08 Jan 2006)
New Revision: 545

Modified:
   sysvinit/trunk/debian/NOTES
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/rcS.5
   sysvinit/trunk/debian/initscripts/share/default.rcS
Log:
Clean up rcS.5 ; remove comments from default /etc/default/rcS

Modified: sysvinit/trunk/debian/NOTES
===================================================================

--- sysvinit/trunk/debian/NOTES	2006-01-07 23:06:32 UTC (rev 544)
+++ sysvinit/trunk/debian/NOTES	2006-01-08 13:47:11 UTC (rev 545)
@@ -87,13 +87,7 @@
 
 regenerating /etc/default/rcS
 -----------------------------
-It would be nice to regenerate /etc/default/rcS so that people have
-updated comments; however the code to update the file should preserve
-not only the settings of seven variables but also any additional
-variable settings in the file (such as TZ); it should also not add any
-settings that are absent from the file.  So if the admin has commented
-out "VERBOSE" then no "VERBOSE=" line should be written.
-
-In svn r541 I removed code from initscripts postinst that didn't meet
-all these requirements.
-
+In svn r541 I removed unreleased code from initscripts postinst that
+didn't fully preserve admin changes.  I wonder if we should strip all
+comments out of existing /etc/default/rcS files and include only a
+reference to rcS(5).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-01-07 23:06:32 UTC (rev 544)
+++ sysvinit/trunk/debian/changelog	2006-01-08 13:47:11 UTC (rev 545)
@@ -24,7 +24,8 @@
     the GNU version prints an error message when the command is not
     found  (Closes: #345321)
   * /etc/default/rcS: Make VERBOSE and DELAYLOGIN default to "no"
-  * /etc/default/rcS: Clean up and correct description of UTC variable
+  * /etc/default/rcS: Remove variable descriptions; refer to man page
+  * rcS.5: Fix descriptions of variables
   * Remove obsolete docs
   * Make initscripts Depend on mount >= 2.11x-1  (Closes: #345968)
   * Remove obsolete dependencies on bsdutils, coreutils, dpkg, kbd and

Modified: sysvinit/trunk/debian/initscripts/rcS.5
===================================================================
--- sysvinit/trunk/debian/initscripts/rcS.5	2006-01-07 23:06:32 UTC (rev 544)
+++ sysvinit/trunk/debian/initscripts/rcS.5	2006-01-08 13:47:11 UTC (rev 545)
@@ -1,59 +1,82 @@
 .TH rcS 5 "03 Nov 2003" "" "Debian Administrator's Manual"
 .SH NAME
-rcS -- defaults used at boot time
+rcS -- variable settings used at boot time
 .SH DESCRIPTION
+The
 .I /etc/default/rcS
-contains information in the following format:
+file contains information in the following format:
 .IP "" .5i
-name=value
+VAR=VAL
 .PP
-Only one value per line is allowed. Comments are allowed too and must start
-with the ``#'' character.
+The syntax is POSIX shell,
+but only one value per line is allowed.
+Comments (starting with '#') are also allowed.
 
 .SH OPTIONS
-The following options can be set, the defaults values are shown:
+The following options can be set.
+For the default values see \fI/usr/share/initscripts/default.rcS\fP.
 
-.IP \fBTMPTIME=0\fP
-On bootup the files in /tmp will be cleaned up if their modification time
-was more than TMPTIME days ago. A value of zero means that all files
-are removed regardless of age. If you don't want the system to clean
-/tmp set TMPTIME to a negative value (\fI-1\fP) or the word \fIinfinite\fP.
+.IP \fBTMPTIME\fP
+On boot the files in /tmp will be deleted if their modification time
+is more than TMPTIME days ago.
+A value of 0 means that files are removed regardless of age.
+If you don't want the system to clean /tmp
+then set TMPTIME to a negative value (e.g., -1)
+or to the word \fIinfinite\fP.
 
-.IP \fBSULOGIN=no\fB
+.IP \fBSULOGIN\fB
 Setting this to
 .B yes
-causes init to spawn a sulogin on the console as one of the first things
-in the boot process. If the administrator does not login, the sulogin will
-timeout after 30 seconds and the boot process will continue.
+causes init to spawn a
+.B sulogin
+on the console early in the boot process.
+If the administrator does not login
+then the sulogin session will time out
+after 30 seconds and the boot process will continue.
 
-.IP \fBDELAYLOGIN=yes\fB
-Normally the system will not let anyone login until the boot process
-is complete and and the system has come up completely in the default runlevel
-(usually level 2). However theoretically it's possible to login a bit earlier,
-as soon as \fI/usr/sbin/inetd\fP is started. The default value of \fBno\fP
-prevents this, setting it to \fByes\fP allows it.
+.IP \fBDELAYLOGIN\fB
+Normally the system will not let anyone log in
+until the boot process is complete
+and the system has finished switching
+to the default runlevel (usually level 2).
+However, in theory it is possible to log in a bit earlier,
+namely, as soon as \fBinetd\fP has started.
+The default value of \fByes\fP prevents this,
+setting it to \fBno\fP allows it.
 
-.IP \fBUTC=\fP
-This is used to interpret the system (BIOS) clock. If this option is set
-to \fIno\fP the system clock is supposed to be set at local time. If this
-option is set to \fIyes\fP the system clock is supposed to be set at UTC
-(Universal Time, a.k.a. GMT).
+.IP \fBUTC\fP
+This is used to govern how the hardware real time clock is interpreted
+when it is read at boot time (for the purpose of setting the system clock)
+and when it is written (for example, at shutdown).
+If this option is set to \fIno\fP
+then the system clock is assumed to be set to local time.
+If the option is set to \fIyes\fP
+then the system clock is assumed to be set to something approximating
+Coordinated Universal Time (UTC).
 
-.IP \fBVERBOSE=yes\fP
-Setting this option to \fBno\fP will make the bootup a bit less verbose.
+.IP \fBVERBOSE\fP
+Setting this option to \fBno\fP will make the boot process
+a bit less verbose.
 
-.IP \fBFSCKFIX=no\fP
-When the root and all other file systems are checked, this happens with the
-\fB-a\fP flag which means \fIautorepair\fP. If there are really big
-inconsistencies, the fsck will bail out. The system will print a message
-asking the administrator to repair the file system maually and present a
-root shell prompt (actually a \fIsulogin\fP prompt) on the console. Setting
-this option to \fB\fP yes causes the fsck commands to be run with the
-\fB-y\fP option instead of the \fB-a\fP option. This will always repair
-the file systems without any interaction but might irreversibly damage
-your file system(s).
+.IP \fBFSCKFIX\fP
+When the root and all other file systems are checked,
+.B fsck
+is invoked with the \fB-a\fP option
+which means "autorepair".
+If there are major inconsistencies
+then the fsck process will bail out.
+The system will print a message
+asking the administrator to repair the file system maually
+and will present a root shell prompt
+(actually a \fIsulogin\fP prompt)
+on the console.
+Setting this option to \fByes\fP causes the fsck commands
+to be run with the \fB-y\fP option instead of the \fB-a\fP option.
+This will tell fsck always to repair the file systems
+without asking for permission.
 
 .SH AUTHOR
 Miquel van Smoorenburg <miquels at cistron.nl>
+
 .SH SEE ALSO
-init(8), inittab(5).
+.BR init "(8), " inittab "(5), " inetd "(8)."

Modified: sysvinit/trunk/debian/initscripts/share/default.rcS
===================================================================
--- sysvinit/trunk/debian/initscripts/share/default.rcS	2006-01-07 23:06:32 UTC (rev 544)
+++ sysvinit/trunk/debian/initscripts/share/default.rcS	2006-01-08 13:47:11 UTC (rev 545)
@@ -3,26 +3,13 @@
 #
 # Default settings for the scripts in /etc/rcS.d/
 #
-# This file belongs to the "initscripts" package.
+# For information about these variables see the rcS(5) manual page.
 #
+# This file belongs to the "initscripts" package.
 
-# Set to the number of days that files in /tmp should be kept.
-# Set to 0 to keep files in /tmp forever.
 TMPTIME=0
-
-# Set to "yes" if you want sulogin to be spawned on bootup.
 SULOGIN=no
-
-# Set to "yes" if you want to prevent users from logging in before system boot
-# is complete.
 DELAYLOGIN=no
-
-# Set to "yes" if your hardware clock is set to Coordinated Universal Time.
-# Set to "no" if your hardware clock is set to local time.
 UTC=yes
-
-# Set to "yes" if you would like more verbose boot messages.
 VERBOSE=no
-
-# Set to "yes" if you want fsck to be run with the "-y" option.
 FSCKFIX=no


