Update Ubuntu templates for quantal

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/templates/lxc-ubuntu-cloud.in b/templates/lxc-ubuntu-cloud.in
index d215e158dd36dc438ddc83bd51a39f4e8f33b667..bc3047bc12c67b327e7f7f940b9e98fba20b16ac 100644 (file)
--- a/templates/lxc-ubuntu-cloud.in
+++ b/templates/lxc-ubuntu-cloud.in
@@ -92,11 +92,11 @@ proc            proc         proc    nodev,noexec,nosuid 0 0
 sysfs           sys          sysfs defaults  0 0
 EOF
 
-    # rmdir /dev/shm in precise containers.
+    # rmdir /dev/shm in precise and quantal containers.
     # I'm afraid of doing rm -rf $rootfs/dev/shm, in case it did
     # get bind mounted to the host's /run/shm.  So try to rmdir
     # it, and in case that fails move it out of the way.
-    if [ $release = "precise" ]; then
+    if [ $release = "precise" ] || [ $release = "quantal" ]; then
         [ -d "$rootfs/dev/shm" ] && rmdir $rootfs/dev/shm
         [ -e "$rootfs/dev/shm" ] && mv $rootfs/dev/shm $rootfs/dev/shm.bak
         ln -s /run/shm $rootfs/dev/shm
@@ -139,7 +139,7 @@ release=lucid
 if [ -f /etc/lsb-release ]; then
     . /etc/lsb-release
     case "$DISTRIB_CODENAME" in
-        lucid|maverick|natty|oneiric|precise)
+        lucid|maverick|natty|oneiric|precise|quantal)
             release=$DISTRIB_CODENAME
         ;;
     esac
@@ -160,7 +160,7 @@ else
         arch="amd64"
     elif [ "$arch" = "armv7l" ]; then
         # note: arm images don't exist before oneiric;  are called armhf in
-        # precise;  and are not supported by the query, so we don't actually
+        # precise and later;  and are not supported by the query, so we don't actually
         # support them yet (see check later on).  When Query2 is available,
         # we'll use that to enable arm images.
         arch="armel"

diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
index 89afb617e23f9f83b191f38d548dbdb422d8f831..29060d181220f1d2743b58f31cb399efa8e21091 100644 (file)
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -54,7 +54,7 @@ EOF
 127.0.0.1 localhost $hostname
 EOF
 
-    if [ "$release" != "precise" ]; then
+    if [ "$release" != "precise" ] && [ "$release" != "quantal" ]; then
         # suppress log level output for udev
         sed -i "s/=\"err\"/=0/" $rootfs/etc/udev/udev.conf
 
@@ -78,7 +78,7 @@ finalize_user()
 {
     user=$1
 
-    if [ "$release" = "precise" ]; then
+    if [ "$release" = "precise" ] || [ "$release" = "quantal" ]; then
         groups="sudo"
     else
         groups="sudo admin"
@@ -310,7 +310,7 @@ copy_configuration()
     fi
 
     ttydir=""
-    if [ $release = "precise" ]; then
+    if [ $release = "precise" ] || [ $release = "quantal" ]; then
         ttydir=" lxc"
     fi
 
@@ -518,11 +518,11 @@ post_process()
         chroot $rootfs apt-get install --force-yes -y --no-install-recommends upstart:${hostarch} mountall:amd64 iproute:amd64 isc-dhcp-client:amd64
     fi
 
-    # rmdir /dev/shm in precise containers.
+    # rmdir /dev/shm in precise and quantal containers.
     # I'm afraid of doing rm -rf $rootfs/dev/shm, in case it did
     # get bind mounted to the host's /run/shm.  So try to rmdir
     # it, and in case that fails move it out of the way.
-    if [ $release = "precise" ]; then
+    if [ $release = "precise" ] || [ $release = "quantal" ]; then
         [ -d "$rootfs/dev/shm" ] && rmdir $rootfs/dev/shm
         [ -e "$rootfs/dev/shm" ] && mv $rootfs/dev/shm $rootfs/dev/shm.bak
         ln -s /run/shm $rootfs/dev/shm
@@ -571,7 +571,7 @@ usage()
     cat <<EOF
 $1 -h|--help [-a|--arch] [-b|--bindhome <user>] [--trim] [-d|--debug]
    [-F | --flush-cache] [-r|--release <release>] [ -S | --auth-key <keyfile>]
-release: lucid | maverick | natty | oneiric | precise
+release: lucid | maverick | natty | oneiric | precise | quantal
 trim: make a minimal (faster, but not upgrade-safe) container
 bindhome: bind <user>'s home into the container
           The ubuntu user will not be created, and <user> will have
@@ -593,7 +593,7 @@ release=lucid
 if [ -f /etc/lsb-release ]; then
     . /etc/lsb-release
     case "$DISTRIB_CODENAME" in
-        lucid|maverick|natty|oneiric|precise)
+        lucid|maverick|natty|oneiric|precise|quantal)
             release=$DISTRIB_CODENAME
         ;;
     esac