aboutsummaryrefslogtreecommitdiffstats
path: root/init/rcS.conf
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2009-12-03 14:37:12 -0500
committerBill Nottingham <notting@redhat.com>2009-12-03 14:37:12 -0500
commitdac32879b0de17d721457801fac65604f937ef00 (patch)
treedb117621e728b4141cdf538e10ec53d731d81e42 /init/rcS.conf
parent79b2b232cb34f7df3e440968240975e44c4b8fc7 (diff)
downloadinitscripts-dac32879b0de17d721457801fac65604f937ef00.tar
initscripts-dac32879b0de17d721457801fac65604f937ef00.tar.gz
initscripts-dac32879b0de17d721457801fac65604f937ef00.tar.bz2
initscripts-dac32879b0de17d721457801fac65604f937ef00.tar.xz
initscripts-dac32879b0de17d721457801fac65604f937ef00.zip
Coalesce the multiple rcX and ttyX jobs into single files.
Adjust other jobs accordingly. Use a configuration parameter for what ttys to start.
Diffstat (limited to 'init/rcS.conf')
-rw-r--r--init/rcS.conf11
1 files changed, 4 insertions, 7 deletions
diff --git a/init/rcS.conf b/init/rcS.conf
index 1c0a54be..51d52312 100644
--- a/init/rcS.conf
+++ b/init/rcS.conf
@@ -6,18 +6,15 @@ start on startup
stop on runlevel
+task
+
# Note: there can be no previous runlevel here, if we have one it's bad
# information (we enter rc1 not rcS for maintenance). Run /etc/rc.d/rc
# without information so that it defaults to previous=N runlevel=S.
console output
-script
- runlevel --set S >/dev/null || true
-
- /etc/rc.d/rc.sysinit
- runlevel --reboot || true
-end script
+exec /etc/rc.d/rc.sysinit
post-stop script
- if [ "$UPSTART_EVENT" = "startup" ]; then
+ if [ "$UPSTART_EVENTS" = "startup" ]; then
runlevel=$(/bin/awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab)
[ -z "$runlevel" ] && runlevel="3"
for t in $(cat /proc/cmdline); do