[Pkg-sysvinit-commits] r248 - in sysvinit/trunk/debian: .
initscripts initscripts/etc/init.d initscripts/lib
initscripts/lib/init
Thomas Hood
jdthood-guest at costa.debian.org
Thu Nov 24 15:46:29 UTC 2005
Author: jdthood-guest
Date: 2005-11-24 15:46:28 +0000 (Thu, 24 Nov 2005)
New Revision: 248
Added:
sysvinit/trunk/debian/initscripts/lib/
sysvinit/trunk/debian/initscripts/lib/init/
sysvinit/trunk/debian/initscripts/lib/init/functions.sh
sysvinit/trunk/debian/initscripts/lib/init/set-rcS-vars.sh
Removed:
sysvinit/trunk/debian/initscripts/etc/init.d/functions.sh
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh
sysvinit/trunk/debian/initscripts/etc/init.d/bootlogd
sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh
sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
sysvinit/trunk/debian/initscripts/etc/init.d/halt
sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin
sysvinit/trunk/debian/initscripts/etc/init.d/umountroot
sysvinit/trunk/debian/initscripts/etc/init.d/urandom
sysvinit/trunk/debian/rules
Log:
Implement INIT_VERBOSE ; move functions.sh to lib/init ; use which to find selinuxenabled ; clean up
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2005-11-24 15:05:27 UTC (rev 247)
+++ sysvinit/trunk/debian/changelog 2005-11-24 15:46:28 UTC (rev 248)
@@ -28,6 +28,8 @@
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)
* pidof: If the program is specified with a path, don't match processes
of programs run from different paths (Closes: #160329)
* init.8: Mention that entering runlevel 1 kills all processes
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh 2005-11-24 15:05:27 UTC (rev 247)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh 2005-11-24 15:46:28 UTC (rev 248)
@@ -3,8 +3,8 @@
#
[ "$VERBOSE" ] || VERBOSE=yes
-
[ -f /etc/default/rcS ] && . /etc/default/rcS
+. /lib/init/set-rcS-vars.sh
. /lib/lsb/init-functions
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootlogd
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootlogd 2005-11-24 15:05:27 UTC (rev 247)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootlogd 2005-11-24 15:46:28 UTC (rev 248)
@@ -16,10 +16,11 @@
DAEMON=/sbin/bootlogd
NAME=bootlogd
DESC="Bootlog daemon"
+[ -r /etc/default/bootlogd ] && . /etc/default/bootlogd
-test -f $DAEMON || exit 0
+test -x "$DAEMON" || exit 0
-[ -r /etc/default/bootlogd ] && . /etc/default/bootlogd
+. /lib/lsb/init-functions
case "$BOOTLOGD_ENABLE" in
[Nn]*)
@@ -27,7 +28,6 @@
;;
esac
-. /lib/lsb/init-functions
STOPPER=
ACTION="$1"
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh 2005-11-24 15:05:27 UTC (rev 247)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh 2005-11-24 15:46:28 UTC (rev 248)
@@ -11,8 +11,8 @@
[ "$DELAYLOGIN" ] || DELAYLOGIN=yes
[ "$EDITMOTD" ] || EDITMOTD=yes
-
[ -f /etc/default/rcS ] && . /etc/default/rcS
+. /lib/init/set-rcS-vars.sh
do_start () {
# Put a nologin file in /etc to prevent people from logging in
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh 2005-11-24 15:05:27 UTC (rev 247)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh 2005-11-24 15:46:28 UTC (rev 248)
@@ -12,11 +12,11 @@
[ "$FSCKFIX" ] || FSCKFIX=no
[ "$VERBOSE" ] || VERBOSE=yes
-
[ -f /etc/default/rcS ] && . /etc/default/rcS
+. /lib/init/set-rcS-vars.sh
+. /lib/init/functions.sh
. /lib/lsb/init-functions
-. /lib/init/functions.sh
do_start () {
# See if we're on AC Power
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh 2005-11-24 15:05:27 UTC (rev 247)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh 2005-11-24 15:46:28 UTC (rev 248)
@@ -10,15 +10,14 @@
# Short-Description: Check to root file system.
### END INIT INFO
+PATH=/lib/init:/bin:/sbin
[ "$SULOGIN" ] || SULOGIN=no
[ "$VERBOSE" ] || VERBOSE=yes
-
[ -f /etc/default/rcS ] && . /etc/default/rcS
+. /lib/init/set-rcS-vars.sh
-PATH=/lib/init:/bin:/sbin
-
-. /lib/lsb/init-functions
. /lib/init/functions.sh
+. /lib/lsb/init-functions
do_start () {
#
Deleted: sysvinit/trunk/debian/initscripts/etc/init.d/functions.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/functions.sh 2005-11-24 15:05:27 UTC (rev 247)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/functions.sh 2005-11-24 15:46:28 UTC (rev 248)
@@ -1,19 +0,0 @@
-#
-# Functions used by several scripts in initscripts package
-#
-# The API provided here is not stable and should only be used
-# by the scripts in the initscripts package.
-#
-
-# Deprecated
-dir_writable () {
- if [ -d "$1/" ] && [ -w "$1/" ] && touch -a "$1/" 2>/dev/null
- then
- return 0
- fi
- return 1
-}
-
-selinux_enabled () {
- [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled
-}
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/halt
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/halt 2005-11-24 15:05:27 UTC (rev 247)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/halt 2005-11-24 15:46:28 UTC (rev 248)
@@ -12,7 +12,6 @@
### END INIT INFO
PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
[ -f /etc/default/halt ] && . /etc/default/halt
. /lib/lsb/init-functions
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh 2005-11-24 15:05:27 UTC (rev 247)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh 2005-11-24 15:46:28 UTC (rev 248)
@@ -13,13 +13,12 @@
[ "$TMPTIME" ] || TMPTIME=0
[ "$VERBOSE" ] || VERBOSE=yes
-
[ -f /etc/default/rcS ] && . /etc/default/rcS
+. /lib/init/set-rcS-vars.sh
. /etc/init.d/bootclean.sh
. /lib/lsb/init-functions
-
do_start () {
#
# Mount local file systems in /etc/fstab.
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh 2005-11-24 15:05:27 UTC (rev 247)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh 2005-11-24 15:46:28 UTC (rev 248)
@@ -17,8 +17,8 @@
[ "TMPTIME" ] || TMPTIME=0
[ "$VERBOSE" ] || VERBOSE=yes
-
[ -f /etc/default/rcS ] && . /etc/default/rcS
+. /lib/init/set-rcS-vars.sh
. /etc/init.d/bootclean.sh
. /lib/lsb/init-functions
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin 2005-11-24 15:05:27 UTC (rev 247)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin 2005-11-24 15:46:28 UTC (rev 248)
@@ -13,12 +13,11 @@
# bootmisc earlier in the boot process.
### END INIT INFO
-[ "$DELAYLOGIN" ] || DELAYLOGIN=yes
PATH=/lib/init:/sbin:/bin
-
+[ "$DELAYLOGIN" ] || DELAYLOGIN=yes
[ -f /etc/default/rcS ] && . /etc/default/rcS
+. /lib/init/set-rcS-vars.sh
-
do_start () {
case "$DELAYLOGIN" in
Y*|y*)
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountroot
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountroot 2005-11-24 15:05:27 UTC (rev 247)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountroot 2005-11-24 15:46:28 UTC (rev 248)
@@ -10,8 +10,8 @@
PATH=/sbin:/bin
[ "$VERBOSE" ] || VERBOSE=yes
-
[ -f /etc/default/rcS ] && . /etc/default/rcS
+. /lib/init/set-rcS-vars.sh
. /lib/lsb/init-functions
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/urandom
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/urandom 2005-11-24 15:05:27 UTC (rev 247)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/urandom 2005-11-24 15:46:28 UTC (rev 248)
@@ -13,8 +13,8 @@
[ -c /dev/urandom ] || exit 0
[ "$VERBOSE" ] || VERBOSE=yes
-
[ -f /etc/default/rcS ] && . /etc/default/rcS
+. /lib/init/set-rcS-vars.sh
. /lib/lsb/init-functions
Added: sysvinit/trunk/debian/initscripts/lib/init/functions.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/lib/init/functions.sh 2005-11-24 15:05:27 UTC (rev 247)
+++ sysvinit/trunk/debian/initscripts/lib/init/functions.sh 2005-11-24 15:46:28 UTC (rev 248)
@@ -0,0 +1,20 @@
+#
+# Functions used by several scripts in initscripts package
+#
+# The API provided here is not stable and should only be used
+# by the scripts in the initscripts package.
+#
+
+# Deprecated
+dir_writable () {
+ # Note that touch is in /usr/bin/
+ if [ -d "$1/" ] && [ -w "$1/" ] && touch -a "$1/" 2>/dev/null
+ then
+ return 0
+ fi
+ return 1
+}
+
+selinux_enabled () {
+ [ "$(which selinuxenabled)" ] && selinuxenabled
+}
Added: sysvinit/trunk/debian/initscripts/lib/init/set-rcS-vars.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/lib/init/set-rcS-vars.sh 2005-11-24 15:05:27 UTC (rev 247)
+++ sysvinit/trunk/debian/initscripts/lib/init/set-rcS-vars.sh 2005-11-24 15:46:28 UTC (rev 248)
@@ -0,0 +1,6 @@
+#
+# Set rcS vars according to other environment variables set on the
+# kernel command line
+#
+
+[ "$INIT_VERBOSE" ] && VERBOSE="$INIT_VERBOSE"
Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules 2005-11-24 15:05:27 UTC (rev 247)
+++ sysvinit/trunk/debian/rules 2005-11-24 15:46:28 UTC (rev 248)
@@ -113,10 +113,11 @@
gzip -9f $(tmp)$(doc)/initscripts/*
cp -af debian/initscripts/share/* $(tmp)/usr/share/initscripts
cp -af debian/initscripts/etc/* $(tmp)/etc
+ cp -af debian/initscripts/lib/* $(tmp)/lib
ln -sf bootlogd $(tmp)/etc/init.d/stop-bootlogd
chmod 755 $(tmp)/etc/init.d/[a-z]*
- chmod 644 $(tmp)/etc/init.d/bootclean.sh $(tmp)/etc/init.d/functions.sh
- mv $(tmp)/etc/init.d/functions.sh $(tmp)/lib/init/functions.sh
+ chmod 644 $(tmp)/etc/init.d/bootclean.sh
+ chmod 644 $(tmp)/lib/init/functions.sh $(tmp)/lib/init/set-rcS-vars.sh
chmod -R g-w $(tmp)
chown -R root.root $(tmp)
install -d -g root -m 755 -o root $(tmp)/bin
More information about the Pkg-sysvinit-commits
mailing list