[Pkg-sysvinit-commits] r298 - in sysvinit/trunk/debian: . initscripts/lib/init

[Thomas Hood]

Author: jdthood-guest
Date: 2005-11-27 12:49:04 +0000 (Sun, 27 Nov 2005)
New Revision: 298

Added:
   sysvinit/trunk/debian/initscripts/lib/init/vars.sh
Removed:
   sysvinit/trunk/debian/initscripts/lib/init/set-rcS-vars.sh
Modified:
   sysvinit/trunk/debian/changelog
Log:
Consolidate variable setting

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-11-27 12:48:45 UTC (rev 297)
+++ sysvinit/trunk/debian/changelog	2005-11-27 12:49:04 UTC (rev 298)
@@ -9,7 +9,7 @@
   [ Thomas Hood ]
   * *.sh: Make sure that these do their thing when they aren't given any
     command line arguments (as is the case when they are sourced)
-  * *.sh: Improve use of log_* functions  (Closes: #55143, #323749)
+  * initscripts: Improve use of log_* functions  (Closes: #55143, #323749)
     There remains the problem that error messages printed by programs
     that are called by initscripts get printed on the console and thus
     mess up single-line-format messages printed by the log_ functions.
@@ -30,24 +30,27 @@
   * umountfs: Unmount tmpfs before swapoff and other fs's afterwards
     (Closes: #328582, hopefully without reopening #84782)
   * Make stop-bootlogd a distinct script rather than a symlink to bootlogd.
-    This allows us to give it a different LSB header.
-  * checkfs.sh: Implement FSCKTYPES  (Closes: #89481)
+    Give it a different LSB header.
+  * checkfs.sh: Implement FSCKTYPES  (Closes: #89481)  Set, e.g.,
     FSCKTYPES="ext2,msdos" to fsck only file system types ext2 and msdos
     See fsck(8) for syntax.  FSCKTYPES="none" disables fsck of file
     systems (other than the root filesystem) altogether.
-  * Allow VERBOSE to be set via the INIT_VERBOSE=yes kernel argument
-    (Closes: #286082)
-  * *.sh: Fix usage messages
+  * initscripts: Set variables using common script
+  * initscripts: Fix usage messages
+  * initscripts: Allow VERBOSE to be set via the INIT_VERBOSE=yes kernel
+    argument (Closes: #286082)  Experimental.  The name of the kernel
+    argument may change in the future if we decide to implement this more
+    generally.
   * Improve skeleton initscript
-  * Clean up indentation and formatting of all initscripts
-  * Run stop-bootlogd in runlevel 1  (Closes: #220025)
+  * initscripts: Clean up indentation and formatting
   * Make initscripts Depend on debianutils >= 2.13.1 in order to prevent
     #295850.  Note that debianutils also has to be >= 2.12.0 so that the
     "which" program is available in /bin.
-  * Remove unneeded sysvinit Dependency on coreutils  (Closes: #316423)
+  * Remove currently unneeded sysvinit Dependency on coreutils
+    (Closes: #316423)
   * pidof: If the program is specified with a path, don't match processes
     of programs run from different paths  (Closes: #160329)
-  * 40_selinux: Remove extra printf argument
+  * 40_selinux: Remove superfluous printf argument
   * init.8: Mention that entering runlevel 1 kills all processes
     (Closes: #238861)
   * update-rc.d.8: Mention that update-rc.d will not create multiple start

Deleted: sysvinit/trunk/debian/initscripts/lib/init/set-rcS-vars.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/lib/init/set-rcS-vars.sh	2005-11-27 12:48:45 UTC (rev 297)
+++ sysvinit/trunk/debian/initscripts/lib/init/set-rcS-vars.sh	2005-11-27 12:49:04 UTC (rev 298)
@@ -1,6 +0,0 @@
-#
-# Set rcS vars according to other environment variables set on the
-# kernel command line
-#
-
-[ "$INIT_VERBOSE" ] && VERBOSE="$INIT_VERBOSE"

Added: sysvinit/trunk/debian/initscripts/lib/init/vars.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/lib/init/vars.sh	2005-11-27 12:48:45 UTC (rev 297)
+++ sysvinit/trunk/debian/initscripts/lib/init/vars.sh	2005-11-27 12:49:04 UTC (rev 298)
@@ -0,0 +1,7 @@
+#
+# Set rcS vars
+#
+
+[ "$VERBOSE" ] || VERBOSE=yes
+[ -r /etc/default/rcS ] . /etc/default/rcS
+[ "$INIT_VERBOSE" ] && VERBOSE="$INIT_VERBOSE"