Merge lp:~ubuntu-branches/ubuntu/precise/lxc/precise-201203170940 into lp:ubuntu/precise/lxc

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/lxc reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/lxc/precise-201203170940. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

80. By Stéphane Graber on 2012-03-17

Re-enable apparmor profile now that the userspace was fixed.
Some part of the profile are still disabled because of missing kernel
or userspace features, see the FIXMEs for these, hopefully fixed soon.

79. By Serge Hallyn on 2012-03-16

0059-reenable-daily-cloudimg: let user specify daily cloud images.

=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2012-03-17 09:44:19 +0000
@@ -0,0 +1,1 @@
+debian/patches
 
=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2012-03-17 09:44:19 +0000
@@ -0,0 +1,1 @@
+series
 
=== added directory '.pc/0059-reenable-daily-cloudimg'
=== renamed directory '.pc/0059-reenable-daily-cloudimg' => '.pc/0059-reenable-daily-cloudimg.moved'
=== added directory '.pc/0059-reenable-daily-cloudimg/templates'
=== added file '.pc/0059-reenable-daily-cloudimg/templates/lxc-ubuntu-cloud.in'
--- .pc/0059-reenable-daily-cloudimg/templates/lxc-ubuntu-cloud.in	1970-01-01 00:00:00 +0000
+++ .pc/0059-reenable-daily-cloudimg/templates/lxc-ubuntu-cloud.in	2012-03-17 09:44:19 +0000
@@ -0,0 +1,351 @@
+#!/bin/bash
+
+# template script for generating ubuntu container for LXC based on released cloud
+# images
+#
+# Copyright © 2012 Serge Hallyn <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+set -e
+
+if [ -r /etc/default/lxc ]; then
+    . /etc/default/lxc
+fi
+
+copy_configuration()
+{
+    path=$1
+    rootfs=$2
+    name=$3
+    arch=$4
+
+    if [ $arch = "i386" ]; then
+        arch="i686"
+    fi
+
+    # if there is exactly one veth network entry, make sure it has an
+    # associated hwaddr.
+    nics=`grep -e '^lxc\.network\.type[ \t]*=[ \t]*veth' $path/config | wc -l`
+    if [ $nics -eq 1 ]; then
+        grep -q "^lxc.network.hwaddr" $path/config || cat <<EOF >> $path/config
+lxc.network.hwaddr= 00:16:3e:$(openssl rand -hex 3| sed 's/\(..\)/\1:/g; s/.$//')
+EOF
+    fi
+
+    cat <<EOF >> $path/config
+lxc.utsname = $name
+
+lxc.tty = 4
+lxc.pts = 1024
+lxc.rootfs = $rootfs
+lxc.mount  = $path/fstab
+lxc.arch = $arch
+lxc.cap.drop = sys_module mac_admin
+
+lxc.cgroup.devices.deny = a
+# Allow any mknod (but not using the node)
+lxc.cgroup.devices.allow = c *:* m
+lxc.cgroup.devices.allow = b *:* m
+# /dev/null and zero
+lxc.cgroup.devices.allow = c 1:3 rwm
+lxc.cgroup.devices.allow = c 1:5 rwm
+# consoles
+lxc.cgroup.devices.allow = c 5:1 rwm
+lxc.cgroup.devices.allow = c 5:0 rwm
+#lxc.cgroup.devices.allow = c 4:0 rwm
+#lxc.cgroup.devices.allow = c 4:1 rwm
+# /dev/{,u}random
+lxc.cgroup.devices.allow = c 1:9 rwm
+lxc.cgroup.devices.allow = c 1:8 rwm
+lxc.cgroup.devices.allow = c 136:* rwm
+lxc.cgroup.devices.allow = c 5:2 rwm
+# rtc
+lxc.cgroup.devices.allow = c 254:0 rwm
+#fuse
+lxc.cgroup.devices.allow = c 10:229 rwm
+#tun
+lxc.cgroup.devices.allow = c 10:200 rwm
+#full
+lxc.cgroup.devices.allow = c 1:7 rwm
+#hpet
+lxc.cgroup.devices.allow = c 10:228 rwm
+#kvm
+lxc.cgroup.devices.allow = c 10:232 rwm
+EOF
+
+    cat <<EOF > $path/fstab
+proc            $rootfs/proc         proc    nodev,noexec,nosuid 0 0
+sysfs           $rootfs/sys          sysfs defaults  0 0
+EOF
+
+    return 0
+}
+
+usage()
+{
+    cat <<EOF
+LXC Container configuration for Ubuntu Cloud images.
+
+Generic Options
+[ -r | --release <release> ]: Release name of container, defaults to host
+[ -a | --arch ]: Arhcitecture of container, defaults to host arcitecture
+[ -C | --cloud ]: Configure container for use with meta-data service, defaults to no
+[ -T | --tarball ]: Location of tarball
+[ -d | --debug ]: Run with 'set -x' to debug errors
+
+Options, mutually exclusive of "-C" and "--cloud":
+  [ -i | --hostid ]:    HostID for cloud-init, defaults to random string
+  [ -u | --userdata ]:  Cloud-init user-data file to configure container on start
+  [ -S | --auth-key ]:  SSH Public key file to inject into container
+  [ -L | --nolocales ]: Do not copy host's locales into container
+
+EOF
+    return 0
+}
+
+options=$(getopt -o a:hp:r:n:Fi:CLS:T:d -l arch:,help,path:,release:,name:,flush-cache,hostid:,auth-key:,cloud,no_locales,tarball:,debug -- "$@")
+if [ $? -ne 0 ]; then
+    usage $(basename $0)
+    exit 1
+fi
+eval set -- "$options"
+
+release=lucid
+if [ -f /etc/lsb-release ]; then
+    . /etc/lsb-release
+    case "$DISTRIB_CODENAME" in
+        lucid|maverick|natty|oneiric|precise)
+            release=$DISTRIB_CODENAME
+        ;;
+    esac
+fi
+
+arch=$(arch)
+
+# Code taken from debootstrap
+if [ -x /usr/bin/dpkg ] && /usr/bin/dpkg --print-architecture >/dev/null 2>&1; then
+    arch=`/usr/bin/dpkg --print-architecture`
+elif type udpkg >/dev/null 2>&1 && udpkg --print-architecture >/dev/null 2>&1; then
+    arch=`/usr/bin/udpkg --print-architecture`
+else
+    arch=$(arch)
+    if [ "$arch" = "i686" ]; then
+        arch="i386"
+    elif [ "$arch" = "x86_64" ]; then
+        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
+        # support them yet (see check later on).  When Query2 is available,
+        # we'll use that to enable arm images.
+        arch="armel"
+    fi
+fi
+
+debug=0
+hostarch=$arch
+cloud=0
+locales=1
+flushcache=0
+while true
+do
+    case "$1" in
+    -h|--help)         usage $0 && exit 0;;
+    -p|--path)         path=$2; shift 2;;
+    -n|--name)         name=$2; shift 2;;
+    -F|--flush-cache)  flushcache=1; shift 1;;
+    -r|--release)      release=$2; shift 2;;
+    -a|--arch)         arch=$2; shift 2;;
+    -i|--hostid)       host_id=$2; shift 2;;
+    -u|--userdata)     userdata=$2; shift 2;;
+    -C|--cloud)        cloud=1; shift 1;;
+    -S|--auth-key)     auth_key=$2; shift 2;;
+    -L|--no_locales)   locales=0; shift 2;;
+    -T|--tarball)      tarball=$2; shift 2;;
+    -d|--debug)        debug=1; shift 1;;
+    --)                shift 1; break ;;
+        *)              break ;;
+    esac
+done
+
+if [ $debug -eq 1 ]; then
+    set -x
+fi
+
+if [ "$arch" == "i686" ]; then
+    arch=i386
+fi
+
+if [ $hostarch = "i386" -a $arch = "amd64" ]; then
+    echo "can't create amd64 container on i386"
+    exit 1
+fi
+
+if [ $arch != "i386" -a $arch != "amd64" ]; then
+    echo "Only i386 and amd64 are supported by the ubuntu cloud template."
+    exit 1
+fi
+
+if [ -z "$path" ]; then
+    echo "'path' parameter is required"
+    exit 1
+fi
+
+if [ "$(id -u)" != "0" ]; then
+    echo "This script should be run as 'root'"
+    exit 1
+fi
+
+rootfs=$path/rootfs
+
+type ubuntu-cloudimg-query
+type wget
+
+# determine the url, tarball, and directory names
+# download if needed
+cache="/var/cache/lxc/cloud-$release"
+
+mkdir -p $cache
+
+if [ -n "$tarball" ]; then
+	url2="$tarball"
+else
+	url1=`ubuntu-cloudimg-query $release released $arch --format "%{url}\n"`
+	url2=`echo $url1 | sed -e 's/.tar.gz/-root\0/'`
+fi
+
+filename=`basename $url2`
+
+buildcleanup()
+{
+    cd $rootfs
+    umount -l $cache/$xdir || true
+    rm -rf $cache
+}
+
+# if the release doesn't have a *-rootfs.tar.gz, then create one from the
+# cloudimg.tar.gz by extracting the .img, mounting it loopback, and creating
+# a tarball from the mounted image.
+build_root_tgz()
+{
+    url=$1
+    filename=$2
+
+    xdir=`mktemp -d -p .`
+    tarname=`basename $url`
+    imgname="`basename $tarname .tar.gz`.img"
+    trap buildcleanup EXIT
+    if [ $flushcache -eq 1 -o ! -f $cache/$tarname ]; then
+        rm -f $tarname
+        echo "Downloading cloud image from $url"
+        wget $url || { echo "Couldn't find cloud image $url."; exit 1; }
+    fi
+    echo "Creating new cached cloud image rootfs"
+    tar zxf $tarname $imgname
+    mount -o loop $imgname $xdir
+    (cd $xdir; tar zcf ../$filename .)
+    umount $xdir
+    rm -f $tarname $imgname
+    rmdir $xdir
+    echo "New cloud image cache created"
+    trap EXIT
+}
+
+mkdir -p /var/lock/subsys/
+(
+    flock -n -x 200
+
+    cd $cache
+    if [ $flushcache -eq 1 ]; then
+        echo "Clearing the cached images"
+        rm -f $filename
+    fi
+
+    if [ ! -f $filename ]; then
+       wget $url2 || build_root_tgz $url1 $filename
+    fi
+
+    echo "Extracting container rootfs"
+    mkdir -p $rootfs
+    cd $rootfs
+    tar -zxf $cache/$filename
+
+
+    if [ $cloud -eq 0 ]; then
+	echo "Configuring for running outside of a cloud environment"
+	echo "If you want to configure for a cloud evironment, please use '-- -C' to create the container"
+
+	seed_d=$rootfs/var/lib/cloud/seed/nocloud-net
+	rhostid=$(uuidgen | cut -c -8)
+	host_id=${hostid:-$rhostid}
+	mkdir -p $seed_d
+
+	cat > "$seed_d/meta-data" <<EOF
+instance_id: lxc-$host_id
+EOF
+
+	rm $rootfs/etc/hostname
+
+	if [ $locales -eq 1 ]; then
+		cp /usr/lib/locale/locale-archive $rootfs/usr/lib/locale/locale-archive
+	fi
+
+
+	if [ -n "$auth_key" -a -f "$auth_key" ]; then
+		u_path="/home/ubuntu/.ssh"
+		root_u_path="$rootfs/$u_path"
+		mkdir -p $root_u_path
+		cp $auth_key "$root_u_path/authorized_keys"
+		chroot $rootfs chown -R ubuntu: "$u_path"
+
+		echo "Inserted SSH public key from $auth_key into /home/ubuntu/.ssh/authorized_keys"
+	fi
+
+	if [ ! -f $userdata ]; then
+		cp $userdata $data_d/user-data
+	else
+
+		if [ -z "$MIRROR" ]; then
+			MIRROR="http://archive.ubuntu.com/ubuntu"
+		fi
+
+		cat > "$seed_d/user-data" <<EOF
+#cloud-config
+output: {all: '| tee -a /var/log/cloud-init-output.log'}
+apt-mirror: $MIRROR
+manage_etc_hosts: localhost
+locale: $(/usr/bin/locale | awk -F= '/LANG=/ {print$NF}')
+EOF
+
+	fi
+
+    	chroot $rootfs /usr/sbin/usermod -U ubuntu
+    	echo "ubuntu:ubuntu" | chroot $rootfs chpasswd
+	echo "Please login as user ubuntu with password ubuntu."
+
+   else
+
+	echo "Configured for running in a cloud environment."
+	echo "If you do not have a meta-data service, this container will likely be useless."
+
+   fi
+
+) 200>/var/lock/subsys/lxc-ubucloud
+
+copy_configuration $path $rootfs $name $arch
+
+echo "Container $name created."
+exit 0
 
=== added file 'debian/patches/0059-reenable-daily-cloudimg'
--- debian/patches/0059-reenable-daily-cloudimg	1970-01-01 00:00:00 +0000
+++ debian/patches/0059-reenable-daily-cloudimg	2012-03-17 09:44:19 +0000
@@ -0,0 +1,65 @@
+Description: re-enable use of daily cloud images
+ There are two types of cloud images - released and daily ones.  We were
+ always using daily ones, instead of using released by default with an
+ option for daily.  Fix that.
+Author: Serge Hallyn <[e-mail]>
+Forwarded: yes
+
+Index: lxc/templates/lxc-ubuntu-cloud.in
+===================================================================
+--- lxc.orig/templates/lxc-ubuntu-cloud.in	2012-03-16 09:40:19.027008000 -0500
++++ lxc/templates/lxc-ubuntu-cloud.in	2012-03-16 09:49:47.882037866 -0500
+@@ -105,6 +105,7 @@
+ [ -C | --cloud ]: Configure container for use with meta-data service, defaults to no
+ [ -T | --tarball ]: Location of tarball
+ [ -d | --debug ]: Run with 'set -x' to debug errors
++[ -s | --stream]: Use specified stream rather than 'released'
+ 
+ Options, mutually exclusive of "-C" and "--cloud":
+   [ -i | --hostid ]:    HostID for cloud-init, defaults to random string
+@@ -116,7 +117,7 @@
+     return 0
+ }
+ 
+-options=$(getopt -o a:hp:r:n:Fi:CLS:T:d -l arch:,help,path:,release:,name:,flush-cache,hostid:,auth-key:,cloud,no_locales,tarball:,debug -- "$@")
++options=$(getopt -o a:hp:r:n:Fi:CLS:T:ds: -l arch:,help,path:,release:,name:,flush-cache,hostid:,auth-key:,cloud,no_locales,tarball:,debug,stream: -- "$@")
+ if [ $? -ne 0 ]; then
+     usage $(basename $0)
+     exit 1
+@@ -160,6 +161,7 @@
+ cloud=0
+ locales=1
+ flushcache=0
++stream="released"
+ while true
+ do
+     case "$1" in
+@@ -176,6 +178,7 @@
+     -L|--no_locales)   locales=0; shift 2;;
+     -T|--tarball)      tarball=$2; shift 2;;
+     -d|--debug)        debug=1; shift 1;;
++    -s|--stream)       stream=$2; shift 2;;
+     --)                shift 1; break ;;
+         *)              break ;;
+     esac
+@@ -199,6 +202,11 @@
+     exit 1
+ fi
+ 
++if [ "$stream" != "daily" -a "$stream" != "released" ]; then
++    echo "Only 'daily' and 'released' streams are supported"
++    exit 1
++fi
++
+ if [ -z "$path" ]; then
+     echo "'path' parameter is required"
+     exit 1
+@@ -223,7 +231,7 @@
+ if [ -n "$tarball" ]; then
+ 	url2="$tarball"
+ else
+-	url1=`ubuntu-cloudimg-query $release released $arch --format "%{url}\n"`
++	url1=`ubuntu-cloudimg-query $release $stream $arch --format "%{url}\n"`
+ 	url2=`echo $url1 | sed -e 's/.tar.gz/-root\0/'`
+ fi
+ 
 
=== renamed file 'debian/patches/0059-reenable-daily-cloudimg' => 'debian/patches/0059-reenable-daily-cloudimg.moved'