- some more 'emits' and a dummy Upstart job added so the new

  'initctl check-config' won't complain.

svn-id: @12244

diff --git a/init/rc.conf b/init/rc.conf
index c834bbe9b091505d4d38b350f65f5c4fd57ad0fa..f48b8df14b96f9af9e72d2bd2a1a5510dafa9f9e 100644 (file)
--- a/init/rc.conf
+++ b/init/rc.conf
@@ -8,6 +8,15 @@ stop on runlevel [!$RUNLEVEL]
 
 emits shutdown
 
+# rc.shutdown
+emits pld.shutdown-started
+
+# /etc/rc.d/init.d/network
+emits  pld.network-starting
+emits  pld.network-started
+emits  pld.network-stopping
+emits  pld.network-stopped
+
 task
 
 export RUNLEVEL

diff --git a/init/rcS.conf b/init/rcS.conf
index d3bbbc1ae03a3f1a0b2fb84233afa8484b1b7347..3d86e4da467fa0d651f8b2dc8c422948511c9582 100644 (file)
--- a/init/rcS.conf
+++ b/init/rcS.conf
@@ -7,6 +7,7 @@ start on startup
 stop on runlevel
 
 emits all-swaps filesystem local-filesystems root-filesystem virtual-filesystems runlevel
+emits pld.sysinit-done
 
 task
 

diff --git a/init/udev.conf b/init/udev.conf
new file mode 100644 (file)
index 0000000..eeada65
--- /dev/null
+++ b/init/udev.conf
@@ -0,0 +1,6 @@
+description "dummy job"
+
+# Dummy job so, the 'udev' dependecies are satisfied although udev is not
+# started by upstart"
+
+# vi: ft=upstart

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 0703c912b26cce9b6690f9b1f81ba5f4f5a474af..510f29c9e683a0e77ec2ffb60c545b588fd3641d 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -254,6 +254,7 @@ if ! is_yes "$VSERVER"; then
 
        if ! is_no "$START_UDEV" && [ -x /sbin/start_udev ]; then
                /sbin/start_udev
+               [ -x /sbin/initctl ] && /sbin/initctl -q start udev
        elif [ -x /lib/firmware/firmware-loader.sh ]; then
                /sbin/sysctl -e -w kernel.hotplug=/lib/firmware/firmware-loader.sh > /dev/null 2>&1
        fi