Merge lp:~smoser/ubuntu/precise/sysvinit/rc.local.d into lp:ubuntu/precise/sysvinit

[Scott Moser]

[Scott Moser (smoser)]

This adds an additional rc.sysv script named 'rc.local.d' which will executable programs in /etc/rc.local.d via run-parts.

If run-parts is not available, or the directory /etc/rc.local.d does not exist, it will exit silently with success.

[Scott Moser (smoser)]

2 other thoughts:
 * I chose adding rc.local.d versus modifying /etc/init.d/rc.local to add 'rc.local.d' support, because I felt that would have been more difficult to reliably detect if rc.local.d support was present. This seems less surprising.
 * I had implemented this as an upstart job also, but felt sysv script fit better with the 'initscripts' package, which is where rc.local was provided.

[Clint Byrum (clint-fewbar)]

Scott this is pretty cool! However, I actually think rc.local *should* be moved to be run by an upstart job rather than rc2.d links. It should be:

# /etc/init/rc-local.conf
start on stopped rc RUNLEVEL=[2345]
task

description "/etc/rc.local"

exec /etc/rc.local start

This would put it pretty much as late as possible in the boot, though it still does not address the fact that some things may be starting in parallel still if they have something like:

start on runlevel [2345]

But that is an issue with the current one as well.

Anyway, that should become part of upstart, and then the update-rc.d removed from initscripts. Then your job gets simpler:

# /etc/init/rc-local-d.conf
start on stopped rc-local
task

description "local boot scripts (/etc/rc.local.d)"

pre-start script
  [ -d /etc/rc.local.d ] || stop
  command -v run-parts >/dev/null 2>&1 || stop
end script

exec run-parts /etc/rc.local.d

I like the idea of having two separate jobs because the user will get messages in noquiet boot (default for servers) that show

* Starting /etc/rc.local
* Stopping /etc/rc.local
* Starting local boot scripts (/etc/rc.local.d)
* Stopping local boot scripts (/etc/rc.local.d)

Would you be willing to move it over to upstart?

review: Needs Information

[Scott Moser (smoser)]

>
> I like the idea of having two separate jobs because the user will get messages
> in noquiet boot (default for servers) that show
>
> * Starting /etc/rc.local
> * Stopping /etc/rc.local
> * Starting local boot scripts (/etc/rc.local.d)
> * Stopping local boot scripts (/etc/rc.local.d)
>
> Would you be willing to move it over to upstart?

I have no objections to rc.local being a upstart job, but having the "sysvinit" package lay down a upstart job just seems strange at best to me. Thats why I stuck with sysvinit style start script.

If we think that rc.local should be an upstart job (and then, rc.local.d following that), I think thats a different bug. I really don't have a strong feeling.

review: Resubmit

[Scott Moser (smoser)]

I've updated bug 915215 in comment 7 with a summary of the state of this bug/feature.

Unmerged revisions

168. By Scott Moser on 2012-01-30

d/src/initscripts/etc/init.d/rc.local.d: add rc.local.d
sysv-init script for executing things in /etc/rc.local.d
in run-parts style (LP: #915215)

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-13 00:16:41 +0000
+++ debian/changelog	2012-01-30 16:08:24 +0000
@@ -1,3 +1,11 @@
+sysvinit (2.88dsf-13.10ubuntu9) UNRELEASED; urgency=low
+
+  * d/src/initscripts/etc/init.d/rc.local.d: add rc.local.d
+    sysv-init script for executing things in /etc/rc.local.d
+    in run-parts style (LP: #915215)
+
+ -- Scott Moser <[e-mail]>  Mon, 30 Jan 2012 10:22:53 -0500
+
 sysvinit (2.88dsf-13.10ubuntu8) precise; urgency=low
 
   * d/src/initscripts/etc/init.d/sendsigs: wait up to 300 extra

=== modified file 'debian/initscripts.conffiles'
--- debian/initscripts.conffiles	2011-07-12 17:08:08 +0000
+++ debian/initscripts.conffiles	2012-01-30 16:08:24 +0000
@@ -5,6 +5,7 @@
 /etc/init.d/killprocs
 /etc/init.d/ondemand
 /etc/init.d/rc.local
+/etc/init.d/rc.local.d
 /etc/init.d/reboot
 /etc/init.d/sendsigs
 /etc/init.d/single

=== modified file 'debian/initscripts.postinst'
--- debian/initscripts.postinst	2011-07-13 20:44:04 +0000
+++ debian/initscripts.postinst	2012-01-30 16:08:24 +0000
@@ -181,6 +181,7 @@
 update-rc.d single                 start 90 1 . >/dev/null || exit $?
 update-rc.d ondemand               start 99 2 3 4 5 . >/dev/null || exit $?
 update-rc.d rc.local               start 99 2 3 4 5 . >/dev/null || exit $?
+update-rc.d rc.local.d             start 99 2 3 4 5 . >/dev/null || exit $?
 #update-rc.d stop-bootlogd-single   start 99 S . >/dev/null || exit $?
 #update-rc.d stop-bootlogd          start 99 2 3 4 5 . >/dev/null || exit $?
 

=== modified file 'debian/initscripts.postrm'
--- debian/initscripts.postrm	2011-07-12 07:41:11 +0000
+++ debian/initscripts.postrm	2012-01-30 16:08:24 +0000
@@ -49,6 +49,7 @@
 	update-rc.d stop-bootlogd         remove >/dev/null || exit $?
 	update-rc.d stop-bootlogd-single  remove >/dev/null || exit $?
 	update-rc.d rc.local              remove >/dev/null || exit $?
+	update-rc.d rc.local.d            remove >/dev/null || exit $?
 	update-rc.d single                remove >/dev/null || exit $?
 	update-rc.d killprocs             remove >/dev/null || exit $?
 	update-rc.d sendsigs              remove >/dev/null || exit $?

=== added file 'debian/src/initscripts/etc/init.d/rc.local.d'
--- debian/src/initscripts/etc/init.d/rc.local.d	1970-01-01 00:00:00 +0000
+++ debian/src/initscripts/etc/init.d/rc.local.d	2012-01-30 16:08:24 +0000
@@ -0,0 +1,44 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          rc.local.d
+# Required-Start:    $remote_fs $syslog $all
+# Required-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:
+# Short-Description: Run files in /etc/rc.local.d if they exist
+### END INIT INFO
+
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+
+. /lib/init/vars.sh
+. /lib/lsb/init-functions
+
+do_start() {
+	if [ -d /etc/rc.local.d ] && command -v run-parts >/dev/null; then
+		[ "$VERBOSE" != no ] &&
+			log_begin_msg "Running local boot scripts (/etc/rc.local.d)"
+		run-parts /etc/rc.local.d
+		ES=$?
+		[ "$VERBOSE" != no ] && log_end_msg $ES
+		return $ES
+	fi
+}
+
+case "$1" in
+	start)
+		do_start
+		;;
+	restart|reload|force-reload)
+		echo "Error: argument '$1' not supported" >&2
+		exit 3
+		;;
+	stop)
+		;;
+	*)
+		echo "Usage: $0 start|stop" >&2
+		exit 3
+		;;
+esac
+
+# vi: ts=4 syntax=sh noexpandtab