upstart for rc.local

svn-id: @12363

diff --git a/init/Makefile.am b/init/Makefile.am
index fc03e1be9949af2ce31a7bec9e639eec35a1d6dd..1c944cee90ffdf9ae4772d83871b22e5dd1d05fc 100644 (file)
--- a/init/Makefile.am
+++ b/init/Makefile.am
@@ -3,6 +3,6 @@
 initdir = @initdir@
 
 init_DATA = random.conf rc.conf rcS-sulogin.conf rcS.conf udev.conf \
-       allowlogin.conf sys-chroots.conf cpusets.conf cryptsetup.conf
+       allowlogin.conf sys-chroots.conf cpusets.conf cryptsetup.conf local.conf
 
 EXTRA_DIST = $(init_DATA)

diff --git a/init/local.conf b/init/local.conf
new file mode 100644 (file)
index 0000000..f0d666c
--- /dev/null
+++ b/init/local.conf
@@ -0,0 +1,14 @@
+description "Invoke custom scripts at startup"
+
+start on stopped rc RUNLEVEL=[!06]
+
+console output
+task
+
+pre-start script
+       test -f /etc/rc.d/rc.local
+end script
+
+script
+       . /etc/rc.d/rc.local
+end script

diff --git a/rc.d/init.d/local b/rc.d/init.d/local
index 01e2fe09cfd228454d19cff2c90536f403d4f9bc..5253976cb8911d4596faade5e9dfaadaf9fa2dc0 100755 (executable)
--- a/rc.d/init.d/local
+++ b/rc.d/init.d/local
@@ -12,6 +12,8 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+upstart_controlled
+
 # See how we were called.
 case "$1" in
   start)