SVN: rc-scripts/trunk: init/Makefile.am init/local.conf rc.d/init.d/local

[glen]

Author: glen
Date: Wed Oct  5 16:47:57 2011
New Revision: 12363

Added:
   rc-scripts/trunk/init/local.conf
Modified:
   rc-scripts/trunk/init/Makefile.am
   rc-scripts/trunk/rc.d/init.d/local
Log:
upstart for rc.local

Modified: rc-scripts/trunk/init/Makefile.am
==============================================================================
--- rc-scripts/trunk/init/Makefile.am	(original)
+++ rc-scripts/trunk/init/Makefile.am	Wed Oct  5 16:47:57 2011
@@ -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)

Added: rc-scripts/trunk/init/local.conf
==============================================================================
--- (empty file)
+++ rc-scripts/trunk/init/local.conf	Wed Oct  5 16:47:57 2011
@@ -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

Modified: rc-scripts/trunk/rc.d/init.d/local
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/local	(original)
+++ rc-scripts/trunk/rc.d/init.d/local	Wed Oct  5 16:47:57 2011
@@ -12,6 +12,8 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+upstart_controlled
+
 # See how we were called.
 case "$1" in
   start)