Drop all Upstart support

[projects/rc-scripts.git] / rc.d / rc.sysinit

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 6da057581ff3edf4bdc6b219e0df994418efef8a..975336f0fe7dccea0dee7815152e912033900c10 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -57,10 +57,6 @@ parse_cmdline() {
 
        for arg in $cmdline; do
                case "$arg" in
-               pld.no-upstart)
-                       # default is set in /etc/sysconfig/system or detected in init.d/functions
-                       USE_UPSTART=no
-               ;;
                noudev)
                        # default is set in /etc/sysconfig/system
                        START_UDEV=no
@@ -490,7 +486,6 @@ if ! is_yes "$VSERVER" && [[ "$container" != lxc* ]]; then
                is_fsmounted devtmpfs /dev || mount -n -t devtmpfs devtmpfs /dev
                load_kernel_modules modules.preudev
                /sbin/start_udev
-               use_upstart && [ -x /sbin/initctl ] && /sbin/initctl -q start udev
        elif [ -x /lib/firmware/firmware-loader.sh ]; then
                /sbin/sysctl -q -e -w kernel.hotplug=/lib/firmware/firmware-loader.sh
        fi
@@ -703,9 +698,6 @@ if ! is_yes "$VSERVER" && [[ "$container" != lxc* ]]; then
                mount -f -t selinuxfs selinuxfs /selinux 2> /dev/null
        fi
 
-       emit --no-wait root-filesystem
-       emit --no-wait virtual-filesystems
-
        if [ ! -f /proc/modules ]; then
                USEMODULES=
        elif [ -z "$nomodules" ]; then
@@ -781,16 +773,14 @@ if ! is_yes "$VSERVER" && [[ "$container" != lxc* ]]; then
        fi
 
        # Load modules
-       if ! use_upstart; then
-               load_kernel_modules modules
-               for f in /etc/modules-load.d/*.conf; do
-                       # already loaded by implicit "modules" load
-                       [ "${f##*/}" = "modules.conf" ] && continue
-
-                       [ -r $f ] || continue
-                       load_kernel_modules ${f##/etc/}
-               done
-       fi
+       load_kernel_modules modules
+       for f in /etc/modules-load.d/*.conf; do
+               # already loaded by implicit "modules" load
+               [ "${f##*/}" = "modules.conf" ] && continue
+
+               [ -r $f ] || continue
+               load_kernel_modules ${f##/etc/}
+       done
 
        if ! is_no "$DM_MULTIPATH" && [ -x /sbin/multipath ]; then
                modprobe -s dm-mod
@@ -945,12 +935,6 @@ if ! is_yes "$VSERVER" && [[ "$container" != lxc* ]]; then
                run_cmd "Turning on quotas for local filesystems" /sbin/quotaon -aug
        fi
 
-       emit --no-wait local-filesystems
-
-       # FIXME: this should be delayed until remote filesystems are mounted,
-       #        especialy when /usr or other standard fs is remote
-       emit --no-wait filesystem
-
        # Turn on process accounting
        if [ -x /etc/rc.d/rc.acct ]; then
                /etc/rc.d/rc.acct start
@@ -977,11 +961,6 @@ if ! is_yes "$VSERVER" && [[ "$container" != lxc* ]]; then
        # ... and here finish configuring parameters
        apply_sysctl
 else
-       emit --no-wait root-filesystem
-       emit --no-wait virtual-filesystems
-       emit --no-wait local-filesystems
-       emit --no-wait filesystem
-
        # /var/log should be writable now, so start saving the boot output
        if [ "$RC_BOOTLOG" ]; then
                echo > /var/log/boot.log
@@ -1047,7 +1026,6 @@ is_yes "$SELINUX" && restorecon /tmp/.ICE-unix >/dev/null 2>&1
 
 if ! is_yes "$VSERVER"; then
        enable_swap
-       emit --no-wait all-swaps
 
        # If a SCSI tape has been detected, load the st module unconditionally
        # since many SCSI tapes don't deal well with st being loaded and unloaded
@@ -1076,8 +1054,6 @@ if ! is_yes "$VSERVER"; then
                i=$(($i-1))
        done
        cp -pf /var/log/dmesg /var/log/dmesg.0
-else
-       emit --no-wait all-swaps
 fi
 
 if ! is_no "$RC_PROMPT"; then
@@ -1101,6 +1077,3 @@ if ! is_no "$RC_PROMPT"; then
        rm -f /var/run/getkey_done
 fi
 echo
-
-emit --no-wait pld.sysinit-done
-