From 2d96c87ac561d6d3d616ee1fb5fe55d4d42b4053 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Tue, 14 Feb 2012 09:42:41 +0100 Subject: Improve comment in init/serial.conf (#746808) --- init/serial.conf | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'init') diff --git a/init/serial.conf b/init/serial.conf index e47df283..dcf7df43 100644 --- a/init/serial.conf +++ b/init/serial.conf @@ -9,8 +9,17 @@ # the proper port is in /etc/securetty, and starts the getty. # # If your serial console is not the primary console, or you want a getty -# on serial even if it's not the console, create your own event by copying -# /etc/init/tty.conf, and changing the getty line in that file. +# on serial even if it's not the console, create your own event e.g. +# /etc/init/ttyS0.conf with content: +# # ttyS0 - agetty +# # +# # This service maintains a agetty on ttyS0. +# +# stop on runlevel [S016] +# start on runlevel [23] +# +# respawn +# exec agetty -h -L -w /dev/ttyS0 115200 vt102 start on fedora.serial-console-available DEV=* and stopped rc RUNLEVEL=[2345] stop on runlevel [S016] -- cgit v1.2.1 From d85174edb7389f670705595804b48aee0278ed2f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 6 Aug 2012 15:18:23 -0400 Subject: Initial removal of support for non-systemd systems. --- init/control-alt-delete.conf | 8 -------- init/plymouth-shutdown.conf | 16 ---------------- init/prefdm.conf | 12 ------------ init/quit-plymouth.conf | 14 -------------- init/rc.conf | 14 -------------- init/rcS-sulogin.conf | 23 ----------------------- init/rcS.conf | 28 ---------------------------- init/serial.conf | 30 ------------------------------ init/splash-manager.conf | 22 ---------------------- init/start-ttys.conf | 15 --------------- init/tty.conf | 9 --------- 11 files changed, 191 deletions(-) delete mode 100644 init/control-alt-delete.conf delete mode 100644 init/plymouth-shutdown.conf delete mode 100644 init/prefdm.conf delete mode 100644 init/quit-plymouth.conf delete mode 100644 init/rc.conf delete mode 100644 init/rcS-sulogin.conf delete mode 100644 init/rcS.conf delete mode 100644 init/serial.conf delete mode 100644 init/splash-manager.conf delete mode 100644 init/start-ttys.conf delete mode 100644 init/tty.conf (limited to 'init') diff --git a/init/control-alt-delete.conf b/init/control-alt-delete.conf deleted file mode 100644 index 35cb1305..00000000 --- a/init/control-alt-delete.conf +++ /dev/null @@ -1,8 +0,0 @@ -# control-alt-delete - emergency keypress handling -# -# This task is run whenever the Control-Alt-Delete key combination is -# pressed. Usually used to shut down the machine. - -start on control-alt-delete - -exec /sbin/shutdown -r now "Control-Alt-Delete pressed" diff --git a/init/plymouth-shutdown.conf b/init/plymouth-shutdown.conf deleted file mode 100644 index 49010848..00000000 --- a/init/plymouth-shutdown.conf +++ /dev/null @@ -1,16 +0,0 @@ -# plymouth-shutdown - put up shutdown splash -# -# This service triggers plymouth to put up a splash -# when leaving runlevel 5. - -start on (splash-request IMMEDIATE=1) or (splash-request and stopped prefdm) - -task -console output -script - /sbin/plymouthd --mode="$MODE" || exit 1 - /bin/plymouth --sysinit - /bin/plymouth --show-splash - /bin/plymouth message --text="$MESSAGE" -end script - diff --git a/init/prefdm.conf b/init/prefdm.conf deleted file mode 100644 index 701b8065..00000000 --- a/init/prefdm.conf +++ /dev/null @@ -1,12 +0,0 @@ -# prefdm - preferred display manager -# -# Starts gdm/xdm/etc by preference - -start on stopped rc RUNLEVEL=5 - -stop on starting rc RUNLEVEL=[!5] - -console output -respawn -respawn limit 10 120 -exec /etc/X11/prefdm -nodaemon diff --git a/init/quit-plymouth.conf b/init/quit-plymouth.conf deleted file mode 100644 index 7a67b071..00000000 --- a/init/quit-plymouth.conf +++ /dev/null @@ -1,14 +0,0 @@ -# quit-plymouth - script to stop boot splash -# -# This service triggers plymouth to quit when we reach the -# end of the boot cycle. We start on 'stopping rcX' to make sure -# this completes before the getty starts. -# prefdm handles quit differently, though. - -start on runlevel S or stopping rc RUNLEVEL=[234] - -task - -script - /bin/plymouth quit || : -end script diff --git a/init/rc.conf b/init/rc.conf deleted file mode 100644 index e7285e47..00000000 --- a/init/rc.conf +++ /dev/null @@ -1,14 +0,0 @@ -# rc - System V runlevel compatibility -# -# This task runs the old sysv-rc runlevel scripts. It -# is usually started by the telinit compatibility wrapper. - -start on runlevel [0123456] - -stop on runlevel [!$RUNLEVEL] - -task - -export RUNLEVEL -console output -exec /etc/rc.d/rc $RUNLEVEL diff --git a/init/rcS-sulogin.conf b/init/rcS-sulogin.conf deleted file mode 100644 index 818518de..00000000 --- a/init/rcS-sulogin.conf +++ /dev/null @@ -1,23 +0,0 @@ -# rcS-sulogin - "single-user" runlevel compatibility -# -# This task runs /bin/bash during "single-user" mode, -# then continues to the default runlevel. - -start on runlevel S - -stop on runlevel [!S] - -console owner -script - . /etc/sysconfig/init - plymouth --hide-splash || true - [ -z "$SINGLE" ] && SINGLE=/sbin/sushell - exec $SINGLE -end script -post-stop script - if [ "$RUNLEVEL" = "S" ]; then - [ -f /etc/inittab ] && runlevel=$(/bin/awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab) - [ -z "$runlevel" ] && runlevel="3" - exec telinit $runlevel - fi -end script diff --git a/init/rcS.conf b/init/rcS.conf deleted file mode 100644 index 6f2e7d17..00000000 --- a/init/rcS.conf +++ /dev/null @@ -1,28 +0,0 @@ -# rcS - runlevel compatibility -# -# This task runs the old sysv-rc startup scripts. - -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 -exec /etc/rc.d/rc.sysinit -post-stop script - if [ "$UPSTART_EVENTS" = "startup" ]; then - [ -f /etc/inittab ] && runlevel=$(/bin/awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab) - [ -z "$runlevel" ] && runlevel="3" - for t in $(cat /proc/cmdline); do - case $t in - -s|single|S|s) runlevel="S" ;; - [1-9]) runlevel="$t" ;; - esac - done - exec telinit $runlevel - fi -end script diff --git a/init/serial.conf b/init/serial.conf deleted file mode 100644 index dcf7df43..00000000 --- a/init/serial.conf +++ /dev/null @@ -1,30 +0,0 @@ -# Automatically start a configured serial console -# -# How this works: -# -# On boot, a udev helper examines /dev/console. If a serial console is the -# primary console (last console on the commandline in grub), the event -# 'fedora.serial-console-available ' is emitted, which -# triggers this script. It waits for the runlevel to finish, ensures -# the proper port is in /etc/securetty, and starts the getty. -# -# If your serial console is not the primary console, or you want a getty -# on serial even if it's not the console, create your own event e.g. -# /etc/init/ttyS0.conf with content: -# # ttyS0 - agetty -# # -# # This service maintains a agetty on ttyS0. -# -# stop on runlevel [S016] -# start on runlevel [23] -# -# respawn -# exec agetty -h -L -w /dev/ttyS0 115200 vt102 - -start on fedora.serial-console-available DEV=* and stopped rc RUNLEVEL=[2345] -stop on runlevel [S016] - -instance $DEV -respawn -pre-start exec /sbin/securetty $DEV -exec /sbin/agetty /dev/$DEV $SPEED vt100-nav diff --git a/init/splash-manager.conf b/init/splash-manager.conf deleted file mode 100644 index eea28ca4..00000000 --- a/init/splash-manager.conf +++ /dev/null @@ -1,22 +0,0 @@ -# splash-manager - requests splash screen -# -# This service emits a splash-request event when -# its time to put up the plymouth splash - -start on starting rc RUNLEVEL=[06] -task - -console output -script - if [ "$RUNLEVEL" = "0" ]; then - MESSAGE=$"Shutting down..." - elif [ "$RUNLEVEL" = "6" ]; then - MESSAGE=$"Restarting..." - fi - if initctl status prefdm 2>/dev/null | grep -q stop/waiting; then - initctl emit splash-request IMMEDIATE=1 MODE=shutdown MESSAGE="$MESSAGE" - else - initctl emit splash-request MODE=shutdown MESSAGE="$MESSAGE" - fi -end script - diff --git a/init/start-ttys.conf b/init/start-ttys.conf deleted file mode 100644 index 1528cf4b..00000000 --- a/init/start-ttys.conf +++ /dev/null @@ -1,15 +0,0 @@ -# -# This service starts the configured number of gettys. - -start on stopped rc RUNLEVEL=[2345] - -env ACTIVE_CONSOLES=/dev/tty[1-6] -env X_TTY=/dev/tty1 -task -script - . /etc/sysconfig/init - for tty in $(echo $ACTIVE_CONSOLES) ; do - [ "$RUNLEVEL" = "5" -a "$tty" = "$X_TTY" ] && continue - initctl start tty TTY=$tty - done -end script diff --git a/init/tty.conf b/init/tty.conf deleted file mode 100644 index fca6388e..00000000 --- a/init/tty.conf +++ /dev/null @@ -1,9 +0,0 @@ -# tty - getty -# -# This service maintains a getty on the specified device. - -stop on runlevel [S016] - -respawn -instance $TTY -exec /sbin/mingetty $TTY -- cgit v1.2.1