Merge lp:~stgraber/ubuntu/precise/upstart/upstart-containers into lp:ubuntu/precise/upstart

[Stéphane Graber]

Merge proposal to make our default upstart jobs container aware.

Add a new container-detect job:
 - emits 'container CONTAINER=type' if in a container
   (with type: lxc, lxc-libvirt, openvz or vserver)
 - emits 'not-container' otherwise
 - writes the container type to /run/container_type for use by
   running-in-container

Adds a new tool running-in-container printing the name of the technology
and return 0 if in a container, returning 1 otherwise.

Add a new console.conf getty job starting only in plain LXC containers.

Update tty[1234] to start on regular machines as well as LXC and
libvirt LXC.

Update tty[56] to only start on regular machines.

Add a Conflict on lxcguest (now useless and providing lxcconsole.conf
which would conflict with the new console.conf).

[Stéphane Graber (stgraber)]

I tested these changes in a lxc container and in a Precise VM, both seemed to work fine.
I have a test package in my experimental PPA: https://launchpad.net/~stgraber/+archive/experimental/+packages

[Stéphane Graber (stgraber)]

Rebased on current packaging branch.

[James Hunt (jamesodhunt)]

Looks good to me. Tested under kvm+lxc environments.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-03 14:19:41 +0000
+++ debian/changelog	2012-02-06 04:44:21 +0000
@@ -1,3 +1,27 @@
+upstart (1.4-0ubuntu6) UNRELEASED; urgency=low
+
+  [ Serge Hallyn ]
+  * debian/conf/container-detect.conf: an upstart job to track whether upstart
+    detected itself running in a container.
+  * debian/running-in-container: a script using container.conf to
+    answer whether upstart is running in a container.
+  * debian/conf/console.conf: run getty on /dev/console when running
+    in a lxc container.
+  * debian/control: conflict with lxcguest.
+
+  [ Stéphane Graber ]
+  * debian/conf/container-detect.conf: extend to also detect OpenVZ and vserver
+    as well as write the type in /run/container_type and emit either:
+    - container CONTAINER=type
+      (where type is lxc, lxc-libvirt, openvz or vserver)
+    - not-container
+  * debian/running-in-container: extend to also print the type of container.
+  * Rebase debian/conf/console.conf on debian/conf/tty1.conf.
+  * Update tty[1234].conf to start on regular machines and LXC containers.
+  * Update tty[56].conf to only start on regular machines.
+
+ -- Stéphane Graber <[e-mail]>  Tue, 31 Jan 2012 15:05:40 -0500
+
 upstart (1.4-0ubuntu5) precise; urgency=low
 
   * Merge of important upstream log fixes to handle scenario attempts

=== added file 'debian/conf/console.conf'
--- debian/conf/console.conf	1970-01-01 00:00:00 +0000
+++ debian/conf/console.conf	2012-02-06 04:44:21 +0000
@@ -0,0 +1,11 @@
+# console - getty
+#
+# This service maintains a getty on console from the point the system is
+# started until it is shut down again.
+
+start on stopped rc RUNLEVEL=[2345] and container CONTAINER=lxc
+
+stop on runlevel [!2345]
+
+respawn
+exec /sbin/getty -8 38400 console

=== added file 'debian/conf/container-detect.conf'
--- debian/conf/container-detect.conf	1970-01-01 00:00:00 +0000
+++ debian/conf/container-detect.conf	2012-02-06 04:44:21 +0000
@@ -0,0 +1,42 @@
+description "Track if upstart is running in a container"
+
+start on mounted MOUNTPOINT=/run
+
+env container
+env LIBVIRT_LXC_UUID
+
+emits container
+emits not-container
+
+pre-start script
+    # The "standard" way of telling if we are in a container
+    # is to check for "container" in init's environment.
+    # The code below is for cases where it's not set.
+
+    # Detect old-style libvirt
+    if [ -z "$container" ]; then
+        [ -n "$LIBVIRT_LXC_UUID" ] && container=lxc-libvirt
+    fi
+
+    # Detect OpenVZ containers
+    if [ -z "$container" ]; then
+        [ -d /proc/vz ] && [ ! -d /proc/bc ] && container=openvz
+    fi
+
+    # Detect Vserver containers
+    if [ -z "$container" ]; then
+        VXID="$(cat /proc/self/status | grep ^VxID | cut -f2)" || true
+        [ "${VXID:-0}" -gt 1 ] && container=vserver
+    fi
+
+    if [ -n "$container" ]; then
+        echo "$container" > /run/container_type || true
+        initctl emit --no-wait container CONTAINER=$container
+        exit 0
+    fi
+
+    # If not a container, stop there
+    rm -f /run/container_type
+    initctl emit --no-wait not-container
+    stop
+end script

=== modified file 'debian/conf/tty1.conf'
--- debian/conf/tty1.conf	2009-07-14 12:30:09 +0000
+++ debian/conf/tty1.conf	2012-02-06 04:44:21 +0000
@@ -3,7 +3,11 @@
 # This service maintains a getty on tty1 from the point the system is
 # started until it is shut down again.
 
-start on stopped rc RUNLEVEL=[2345]
+start on stopped rc RUNLEVEL=[2345] and (
+            not-container or
+            container CONTAINER=lxc or
+            container CONTAINER=lxc-libvirt)
+
 stop on runlevel [!2345]
 
 respawn

=== modified file 'debian/conf/tty2.conf'
--- debian/conf/tty2.conf	2009-07-14 12:30:09 +0000
+++ debian/conf/tty2.conf	2012-02-06 04:44:21 +0000
@@ -3,7 +3,11 @@
 # This service maintains a getty on tty2 from the point the system is
 # started until it is shut down again.
 
-start on runlevel [23]
+start on runlevel [23] and (
+            not-container or
+            container CONTAINER=lxc or
+            container CONTAINER=lxc-libvirt)
+
 stop on runlevel [!23]
 
 respawn

=== modified file 'debian/conf/tty3.conf'
--- debian/conf/tty3.conf	2009-07-14 12:30:09 +0000
+++ debian/conf/tty3.conf	2012-02-06 04:44:21 +0000
@@ -3,7 +3,11 @@
 # This service maintains a getty on tty3 from the point the system is
 # started until it is shut down again.
 
-start on runlevel [23]
+start on runlevel [23] and (
+            not-container or
+            container CONTAINER=lxc or
+            container CONTAINER=lxc-libvirt)
+
 stop on runlevel [!23]
 
 respawn

=== modified file 'debian/conf/tty4.conf'
--- debian/conf/tty4.conf	2009-07-14 12:30:09 +0000
+++ debian/conf/tty4.conf	2012-02-06 04:44:21 +0000
@@ -3,7 +3,11 @@
 # This service maintains a getty on tty4 from the point the system is
 # started until it is shut down again.
 
-start on runlevel [23]
+start on runlevel [23] and (
+            not-container or
+            container CONTAINER=lxc or
+            container CONTAINER=lxc-libvirt)
+
 stop on runlevel [!23]
 
 respawn

=== modified file 'debian/conf/tty5.conf'
--- debian/conf/tty5.conf	2009-07-14 12:30:09 +0000
+++ debian/conf/tty5.conf	2012-02-06 04:44:21 +0000
@@ -3,7 +3,8 @@
 # This service maintains a getty on tty5 from the point the system is
 # started until it is shut down again.
 
-start on runlevel [23]
+start on runlevel [23] and not-container
+
 stop on runlevel [!23]
 
 respawn

=== modified file 'debian/conf/tty6.conf'
--- debian/conf/tty6.conf	2009-07-14 12:30:09 +0000
+++ debian/conf/tty6.conf	2012-02-06 04:44:21 +0000
@@ -3,7 +3,8 @@
 # This service maintains a getty on tty6 from the point the system is
 # started until it is shut down again.
 
-start on runlevel [23]
+start on runlevel [23] and not-container
+
 stop on runlevel [!23]
 
 respawn

=== modified file 'debian/control'
--- debian/control	2012-01-09 10:10:08 +0000
+++ debian/control	2012-02-06 04:44:21 +0000
@@ -12,7 +12,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, sysv-rc, initscripts, mountall, ifupdown (>= 0.6.10ubuntu5)
 Suggests: python, graphviz, bash-completion
 Replaces: upstart-job, sysvinit, upstart-compat-sysv, startup-tasks, system-services
-Conflicts: upstart-job, sysvinit, upstart-compat-sysv, startup-tasks, system-services
+Conflicts: upstart-job, sysvinit, upstart-compat-sysv, startup-tasks, system-services, lxcguest
 Provides: upstart-job, upstart-compat-sysv, startup-tasks, system-services
 Breaks: libc6 (<< 2.12.1-0ubuntu12), friendly-recovery (<< 0.2.13)
 Multi-Arch: foreign

=== added file 'debian/running-in-container'
--- debian/running-in-container	1970-01-01 00:00:00 +0000
+++ debian/running-in-container	2012-02-06 04:44:21 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Return 0 if in a container, 1 if not
+# if in a container, also print the container type
+status container-detect 2>/dev/null | grep -q start
+
+if [ $? -eq 0 ]; then
+    [ -f /run/container_type ] && cat /run/container_type
+    exit 0
+fi
+exit 1

=== modified file 'debian/upstart.install'
--- debian/upstart.install	2010-12-20 16:03:33 +0000
+++ debian/upstart.install	2012-02-06 04:44:21 +0000
@@ -2,3 +2,4 @@
 debian/upstart-job lib/init/
 debian/apparmor-profile-load lib/init/
 debian/migrate-inittab.pl usr/lib/upstart/
+debian/running-in-container bin/