diff options
author | Colin Guthrie <colin@mageia.org> | 2012-10-28 20:16:00 +0000 |
---|---|---|
committer | Colin Guthrie <colin@mageia.org> | 2012-10-28 20:16:00 +0000 |
commit | 5b2ce4ba3ff6cf5d7df7f5760107ff2f3e7dbe6f (patch) | |
tree | ec8a31bfe3ca67db6c5f31e1e34e59708fdfe557 /init | |
parent | 35326f41a29186a00331117c4419a904c6563c7c (diff) | |
parent | bf95e22c4164b82112d043169495a71d1bfa0068 (diff) | |
download | initscripts-5b2ce4ba3ff6cf5d7df7f5760107ff2f3e7dbe6f.tar initscripts-5b2ce4ba3ff6cf5d7df7f5760107ff2f3e7dbe6f.tar.gz initscripts-5b2ce4ba3ff6cf5d7df7f5760107ff2f3e7dbe6f.tar.bz2 initscripts-5b2ce4ba3ff6cf5d7df7f5760107ff2f3e7dbe6f.tar.xz initscripts-5b2ce4ba3ff6cf5d7df7f5760107ff2f3e7dbe6f.zip |
Merge tag 'initscripts-9.41-1' into mga-41
Tag as initscripts-9.41-1
Conflicts:
.gitignore
Makefile
inittab
po/xgettext_sh.py
prefdm
rc.d/init.d/functions
rc.d/init.d/halt
rc.d/init.d/killall
rc.d/init.d/netfs
rc.d/init.d/network
rc.d/init.d/single
rc.d/rc
rc.d/rc.local
rc.d/rc.sysinit
service
src/console_check.c
src/console_init.c
sysconfig.txt
sysconfig/network-scripts/ifdown
sysconfig/network-scripts/ifdown-eth
sysconfig/network-scripts/ifup
sysconfig/network-scripts/ifup-eth
sysconfig/network-scripts/ifup-ippp
sysconfig/network-scripts/network-functions
systemd/system/fedora-wait-storage.service
udev/rules.d/10-console.rules
Merge Notes:
1. prefdm: We are keeping the current prefdm script which parses
/etc/sysconfig/desktop to find the current preferred dm. We also
keep the hunk in sysconfig.txt which relates to the afore mentioned
file. Longer term, we should drop this and move to per-dm units.
2. sysconfig/network-scripts/ifup-ippp is still removed at our end...
is there a replacement?
3. I used our /sbin/service as it varies quite a lot from fedora. I'd
be tempted to drop our custom version in favour of upstream
(s/libexec/lib/)
4. ifup/ifdown NM wrappers have been included - previously we just
printed a "Device is manged by NM skipping.." message.
CONFLICT (modify/delete): udev/rules.d/10-console.rules deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of udev/rules.d/10-console.rules left in tree.
Auto-merging systemd/system/fedora-wait-storage.service
CONFLICT (content): Merge conflict in systemd/system/fedora-wait-storage.service
Auto-merging systemd/fedora-storage-init
Auto-merging sysconfig/network-scripts/network-functions
CONFLICT (content): Merge conflict in sysconfig/network-scripts/network-functions
Removing sysconfig/network-scripts/net.hotplug
Auto-merging sysconfig/network-scripts/ifup-sit
Auto-merging sysconfig/network-scripts/ifup-post
Auto-merging sysconfig/network-scripts/ifup-plusb
CONFLICT (modify/delete): sysconfig/network-scripts/ifup-ippp deleted in
HEAD and modified in initscripts-9.41-1. Version initscripts-9.41-1 of sysconfig/network-scripts/ifup-ippp left in tree.
Auto-merging sysconfig/network-scripts/ifup-eth
CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifup-eth
Auto-merging sysconfig/network-scripts/ifup
CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifup
Auto-merging sysconfig/network-scripts/ifdown-sit
Auto-merging sysconfig/network-scripts/ifdown-post
Auto-merging sysconfig/network-scripts/ifdown-eth
CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifdown-eth
Auto-merging sysconfig/network-scripts/ifdown
CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifdown
Auto-merging sysconfig.txt
CONFLICT (content): Merge conflict in sysconfig.txt
Removing src/testdinit
Removing src/testd.c
Removing src/securetty.c
Removing src/securetty.8
Removing src/getkey.c
Removing src/getkey.1
Removing src/fstab-decode.c
Removing src/fstab-decode.8
CONFLICT (modify/delete): src/console_init.c deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of src/console_init.c left in tree.
CONFLICT (modify/delete): src/console_check.c deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of src/console_check.c left in tree.
Auto-merging service
CONFLICT (content): Merge conflict in service
CONFLICT (modify/delete): rc.d/rc.sysinit deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/rc.sysinit left in tree.
CONFLICT (modify/delete): rc.d/rc.local deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/rc.local left in tree.
CONFLICT (modify/delete): rc.d/rc deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/rc left in tree.
CONFLICT (modify/delete): rc.d/init.d/single deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/single left in tree.
Auto-merging rc.d/init.d/network
CONFLICT (content): Merge conflict in rc.d/init.d/network
CONFLICT (modify/delete): rc.d/init.d/netfs deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/netfs left in tree.
Auto-merging rc.d/init.d/netconsole
CONFLICT (modify/delete): rc.d/init.d/killall deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/killall left in tree.
CONFLICT (modify/delete): rc.d/init.d/halt deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/halt left in tree.
Auto-merging rc.d/init.d/functions
CONFLICT (content): Merge conflict in rc.d/init.d/functions
CONFLICT (modify/delete): prefdm deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of prefdm left in tree.
Auto-merging ppp/ip-up.ipv6to4
CONFLICT (modify/delete): po/xgettext_sh.py deleted in HEAD and modified in initscripts-9.41-1. Version initscripts-9.41-1 of po/xgettext_sh.py left in tree.
Removing inittab.upstart
Removing inittab.systemd
Removing inittab.s390
Auto-merging inittab
CONFLICT (content): Merge conflict in inittab
Removing init/tty.conf
Removing init/start-ttys.conf
Removing init/splash-manager.conf
Removing init/serial.conf
Removing init/rcS.conf
Removing init/rcS-sulogin.conf
Removing init/rc.conf
Removing init/quit-plymouth.conf
Removing init/prefdm.conf
Removing init/plymouth-shutdown.conf
Removing init/control-alt-delete.conf
Removing crypttab.5
Removing README-init
Removing NetworkManager/dispatcher.d/05-netfs
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
Automatic merge failed; fix conflicts and then commit the result.
Diffstat (limited to 'init')
-rw-r--r-- | init/control-alt-delete.conf | 8 | ||||
-rw-r--r-- | init/plymouth-shutdown.conf | 16 | ||||
-rw-r--r-- | init/prefdm.conf | 12 | ||||
-rw-r--r-- | init/quit-plymouth.conf | 14 | ||||
-rw-r--r-- | init/rc.conf | 14 | ||||
-rw-r--r-- | init/rcS-sulogin.conf | 23 | ||||
-rw-r--r-- | init/rcS.conf | 28 | ||||
-rw-r--r-- | init/serial.conf | 21 | ||||
-rw-r--r-- | init/splash-manager.conf | 22 | ||||
-rw-r--r-- | init/start-ttys.conf | 15 | ||||
-rw-r--r-- | init/tty.conf | 9 |
11 files changed, 0 insertions, 182 deletions
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 e47df283..00000000 --- a/init/serial.conf +++ /dev/null @@ -1,21 +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 <port name> <speed>' 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 by copying -# /etc/init/tty.conf, and changing the getty line in that file. - -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 |