main/lxc: add support for lxc's autostart feature

this makes it possible to mark which containers you want to be
autostarted in the container config and then use

  /etc/init.d/lxc start

to start them all

same with stop/reboot.

1 files changed, 24 insertions, 3 deletions

diff --git a/main/lxc/lxc.initd b/main/lxc/lxc.initd
index 1b348894d4..db4a149618 100644
--- a/main/lxc/lxc.initd
+++ b/main/lxc/lxc.initd
@@ -35,9 +35,8 @@ lxc_get_var() {
 
 checkconfig() {
 	if [ ${CONTAINER} = ${SVCNAME} ]; then
-		eerror "You have to create an init script for each container:"
-		eerror " ln -s lxc /etc/init.d/lxc.container"
-		return 1
+		CONTAINER=
+		return 0
 	fi
 	CONFIGFILE=${CONFIGFILE:-$(lxc_get_configfile)}
 
@@ -52,8 +51,20 @@ checkconfig() {
 	fi
 }
 
+_autostart() {
+	ebegin "$1 LXC containers"
+	shift
+	lxc-autostart --group "${LXC_GROUP:-onboot,}" "$@"
+	eend $?
+}
+
 start() {
 	checkconfig || return 1
+	if [ -z "$CONTAINER" ]; then
+		_autostart "Starting"
+		return
+	fi
+
 	rm -f /var/log/lxc/${CONTAINER}.log
 
 	rootpath=$(lxc_get_var lxc.rootfs)
@@ -75,6 +86,10 @@ start() {
 
 stop() {
 	checkconfig || return 1
+	if [ -z "$CONTAINER" ]; then
+		_autostart "Stopping" --shutdown --timeout ${LXC_TIMEOUT:-30}
+		return
+	fi
 
 	ebegin "Stopping container ${CONTAINER}"
 	start-stop-daemon --stop --pidfile ${pidfile} \
@@ -85,8 +100,14 @@ stop() {
 
 reboot() {
 	checkconfig || return 1
+	if [ -z "$CONTAINER" ]; then
+		_autostart "Rebooting" --reboot
+		return
+	fi
+
 	ebegin "Sending reboot signal to container $CONTAINER"
 	start-stop-daemon --signal ${RESTART_SIG:-SIGTERM} \
 		--pidfile ${pidfile}
 	eend $?
 }
+