aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2008-04-25 14:13:35 -0400
committerBill Nottingham <notting@redhat.com>2008-04-25 14:13:35 -0400
commit1de0b38f2b65479c6a5a4bf67b67d995cd7c7a89 (patch)
treefe1c8004f87b4cd4447892ec118e8a41969b3dd8
parentae9e1c75a5e24e4f2c9d60eb4b8838e0b043ec7d (diff)
downloadinitscripts-1de0b38f2b65479c6a5a4bf67b67d995cd7c7a89.tar
initscripts-1de0b38f2b65479c6a5a4bf67b67d995cd7c7a89.tar.gz
initscripts-1de0b38f2b65479c6a5a4bf67b67d995cd7c7a89.tar.bz2
initscripts-1de0b38f2b65479c6a5a4bf67b67d995cd7c7a89.tar.xz
initscripts-1de0b38f2b65479c6a5a4bf67b67d995cd7c7a89.zip
Import from event-compat-sysv-0.3.9-11.fc9
- Make ttys start after prefdm in runlevel 5 - Merge rc-default into rcS - Remove reliance on /etc/inittab
-rw-r--r--event.d/rc-default22
-rw-r--r--event.d/rcS20
-rw-r--r--event.d/tty12
-rw-r--r--event.d/tty22
-rw-r--r--event.d/tty32
-rw-r--r--event.d/tty42
-rw-r--r--event.d/tty52
-rw-r--r--event.d/tty62
8 files changed, 18 insertions, 36 deletions
diff --git a/event.d/rc-default b/event.d/rc-default
deleted file mode 100644
index 9160062b..00000000
--- a/event.d/rc-default
+++ /dev/null
@@ -1,22 +0,0 @@
-# rc - runlevel compatibility
-#
-# This task guesses what the "default runlevel" should be and starts the
-# appropriate script.
-
-start on stopped rcS
-
-script
- runlevel --reboot || true
-
- RL="2"
- if [ -r /etc/inittab ]; then
- RL="$(sed -n -e "/^id:[0-9]*:initdefault:/{s/^id://;s/:.*//;p}" /etc/inittab || true)"
- fi
- for t in $(cat /proc/cmdline); do
- case $t in
- -s|single|S) RL="S" ;;
- [1-9]) RL="$t" ;;
- esac
- done
- telinit $RL
-end script
diff --git a/event.d/rcS b/event.d/rcS
index 7717e3bd..b361de1c 100644
--- a/event.d/rcS
+++ b/event.d/rcS
@@ -13,13 +13,17 @@ console output
script
runlevel --set S >/dev/null || true
- #set $(runlevel --set S || true)
- #if [ "$1" != "unknown" ]; then
- # PREVLEVEL=$1
- # RUNLEVEL=$2
- # export PREVLEVEL RUNLEVEL
- #fi
+ /etc/rc.d/rc.sysinit
+ runlevel --reboot || true
+ . /etc/sysconfig/init
- exec /etc/rc.d/rc.sysinit
- exec /etc/rc.d/rc S
+ RL="3"
+ [ "$GRAPHICAL" = "yes" ] && RL="5"
+ for t in $(cat /proc/cmdline); do
+ case $t in
+ -s|single|S) RL="S" ;;
+ [1-9]) RL="$t" ;;
+ esac
+ done
+ telinit $RL
end script
diff --git a/event.d/tty1 b/event.d/tty1
index bbeb0d9f..f0002ae3 100644
--- a/event.d/tty1
+++ b/event.d/tty1
@@ -6,7 +6,7 @@
start on stopped rc2
start on stopped rc3
start on stopped rc4
-start on stopped rc5
+start on started prefdm
stop on runlevel 0
stop on runlevel 1
diff --git a/event.d/tty2 b/event.d/tty2
index bf496f89..ec5f94cd 100644
--- a/event.d/tty2
+++ b/event.d/tty2
@@ -6,7 +6,7 @@
start on stopped rc2
start on stopped rc3
start on stopped rc4
-start on stopped rc5
+start on started prefdm
stop on runlevel 0
stop on runlevel 1
diff --git a/event.d/tty3 b/event.d/tty3
index 4801aa8d..ed95fdcf 100644
--- a/event.d/tty3
+++ b/event.d/tty3
@@ -6,7 +6,7 @@
start on stopped rc2
start on stopped rc3
start on stopped rc4
-start on stopped rc5
+start on started prefdm
stop on runlevel 0
stop on runlevel 1
diff --git a/event.d/tty4 b/event.d/tty4
index 0a6a08d8..76b6d717 100644
--- a/event.d/tty4
+++ b/event.d/tty4
@@ -6,7 +6,7 @@
start on stopped rc2
start on stopped rc3
start on stopped rc4
-start on stopped rc5
+start on started prefdm
stop on runlevel 0
stop on runlevel 1
diff --git a/event.d/tty5 b/event.d/tty5
index 269fa658..9e9d8137 100644
--- a/event.d/tty5
+++ b/event.d/tty5
@@ -6,7 +6,7 @@
start on stopped rc2
start on stopped rc3
start on stopped rc4
-start on stopped rc5
+start on started prefdm
stop on runlevel 0
stop on runlevel 1
diff --git a/event.d/tty6 b/event.d/tty6
index aaeb6936..7eb42c01 100644
--- a/event.d/tty6
+++ b/event.d/tty6
@@ -6,7 +6,7 @@
start on stopped rc2
start on stopped rc3
start on stopped rc4
-start on stopped rc5
+start on started prefdm
stop on runlevel 0
stop on runlevel 1