Merge lp:~ubuntu-branches/ubuntu/oneiric/lxc/oneiric-201109152108 into lp:ubuntu/oneiric/lxc

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/lxc reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/lxc/oneiric-201109152108. 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

37. By Chuck Short on 2011-09-15

* debian/patches/0007-fix-lxc-clone-hostname.patch: make sure $hostname
  is defined before it is first used. Reported by Benjamin Saller.
  (LP: #850205)
* add missing ; at end of 'send hostname' in dhclient.conf (LP: #851274)

=== added directory '.pc/0007-fix-lxc-clone-hostname.patch'
=== renamed directory '.pc/0007-fix-lxc-clone-hostname.patch' => '.pc/0007-fix-lxc-clone-hostname.patch.moved'
=== added file '.pc/0007-fix-lxc-clone-hostname.patch/.timestamp'
=== added directory '.pc/0007-fix-lxc-clone-hostname.patch/src'
=== added directory '.pc/0007-fix-lxc-clone-hostname.patch/src/lxc'
=== added file '.pc/0007-fix-lxc-clone-hostname.patch/src/lxc/lxc-clone.in'
--- .pc/0007-fix-lxc-clone-hostname.patch/src/lxc/lxc-clone.in	1970-01-01 00:00:00 +0000
+++ .pc/0007-fix-lxc-clone-hostname.patch/src/lxc/lxc-clone.in	2011-09-15 21:13:31 +0000
@@ -0,0 +1,208 @@
+#!/bin/bash
+
+#
+# lxc: linux Container library
+
+# Authors:
+# Serge Hallyn <[e-mail]>
+# Daniel Lezcano <[e-mail]>
+
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This library 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
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+usage() {
+    echo "usage: lxc-clone -o <orig> -n <new> [-s] [-h] [-L fssize] [-v vgname]"
+}
+
+help() {
+    usage
+    echo
+    echo "creates a lxc system object."
+    echo
+    echo "Options:"
+    echo "orig        : name of the original container"
+    echo "new         : name of the new container"
+    echo "-s          : make the new rootfs a snapshot of the original"
+    echo "fssize      : size if creating a new fs.  By default, 2G"
+    echo "vgname      : lvm volume group name, lxc by default"
+}
+
+shortoptions='ho:n:sL:v:'
+longoptions='help,orig:,name:,snapshot,fssize,vgname'
+lxc_path=/var/lib/lxc
+bindir=/usr/bin
+snapshot=no
+lxc_size=2G
+lxc_vg=lxc
+
+getopt=$(getopt -o $shortoptions --longoptions  $longoptions -- "$@")
+if [ $? != 0 ]; then
+    usage
+    exit 1;
+fi
+
+eval set -- "$getopt"
+
+while true; do
+        case "$1" in
+	    -h|--help)
+		help
+		exit 1
+		;;
+	    -s|--snapshot)
+		shift
+		snapshot=yes
+		;;
+	    -o|--orig)
+		shift
+		lxc_orig=$1
+		shift
+		;;
+	    -L|--fssize)
+		shift
+		lxc_size=$1
+		shift
+		;;
+	    -v|--vgname)
+		shift
+		lxc_vg=$1
+		shift
+		;;
+	    -n|--new)
+		shift
+		lxc_new=$1
+		shift
+		;;
+            --)
+		shift
+		break;;
+            *)
+		echo $1
+		usage
+		exit 1
+		;;
+        esac
+done
+
+if [ -z "$lxc_path" ]; then
+    echo "no configuration path defined !"
+    exit 1
+fi
+
+if [ ! -r $lxc_path ]; then
+    echo "configuration path '$lxc_path' not found"
+    exit 1
+fi
+
+if [ -z "$lxc_orig" ]; then
+    echo "no original container name specified"
+    usage
+    exit 1
+fi
+
+if [ -z "$lxc_new" ]; then
+    echo "no new container name specified"
+    usage
+    exit 1
+fi
+
+if [ "$(id -u)" != "0" ]; then
+   echo "This command has to be run as root"
+   exit 1
+fi
+
+if [ ! -r $lxc_path ]; then
+    echo "no configuration path defined !"
+    exit 1
+fi
+
+if [ ! -d "$lxc_path/$lxc_orig" ]; then
+    echo "'$lxc_orig' does not exist"
+    exit 1
+fi
+
+if [ -d "$lxc_path/$lxc_new" ]; then
+    echo "'$lxc_new' already exists"
+    exit 1
+fi
+
+trap "${bindir}/lxc-destroy -n $lxc_new; echo aborted; exit 1" SIGHUP SIGINT SIGTERM
+
+mkdir -p $lxc_path/$lxc_new
+
+echo "Tweaking configuration"
+cp $lxc_path/$lxc_orig/config $lxc_path/$lxc_new/config
+sed -i '/lxc.utsname/d' $lxc_path/$lxc_new/config
+echo "lxc.utsname = $hostname" >> $lxc_path/$lxc_new/config
+
+sed -i '/lxc.mount/d' $lxc_path/$lxc_new/config
+echo "lxc.mount = $lxc_path/$lxc_new/fstab" >> $lxc_path/$lxc_new/config
+
+cp $lxc_path/$lxc_orig/fstab $lxc_path/$lxc_new/fstab
+sed -i "s@$lxc_path/$lxc_orig@$lxc_path/$lxc_new@" $lxc_path/$lxc_new/fstab
+
+echo "Copying rootfs..."
+rootfs=$lxc_path/$lxc_new/rootfs
+# First figure out if the old is a device.  For now we only support
+# lvm devices.
+mounted=0
+sed -i '/lxc.rootfs/d' $lxc_path/$lxc_new/config
+oldroot=`grep lxc.rootfs $lxc_path/$lxc_orig/config | awk -F= '{ print $2 '}`
+if [ -b $oldroot ]; then
+	# this is a device.  If we don't want to snapshot, then mkfs, mount
+	# and rsync.  Trivial but not yet implemented
+	if [ $snapshot == "no" ]; then
+		echo "non-snapshot and non-lvm clone of block device not yet implemented"
+		exit 1
+	fi
+	lvdisplay $oldroot > /dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "non-snapshot and non-lvm clone of block device not yet implemented"
+		exit 1
+	fi
+	# ok, create a snapshot of the lvm device
+	lvcreate -s -L $lxc_size -n $lxc_new /dev/$lxc_vg/$lxc_orig || exit 1
+	echo "lxc.rootfs = /dev/$lxc_vg/$lxc_new" >> $lxc_path/$lxc_new/config
+	# and mount it so we can tweak it
+	mkdir -p $lxc_path/$lxc_new/rootfs
+	mount /dev/$lxc_vg/$lxc_new $rootfs || { echo "failed to mount new rootfs"; exit 1; }
+	mounted=1
+else
+	cp -a $lxc_path/$lxc_orig/rootfs $lxc_path/$lxc_new/rootfs || return 1
+	echo "lxc.rootfs = $rootfs" >> $lxc_path/$lxc_new/config
+fi
+
+echo "Updating rootfs..."
+hostname=$lxc_new
+
+# so you can 'ssh $hostname.' or 'ssh $hostname.local'
+if [ -f $rootfs/etc/dhcp/dhclient.conf ]; then
+	sed -i "s/send host-name.*$/send host-name $hostname/" $rootfs/etc/dhcp/dhclient.conf
+fi
+
+# set the hostname
+cat <<EOF > $rootfs/etc/hostname
+$hostname
+EOF
+# set minimal hosts
+cat <<EOF > $rootfs/etc/hosts
+127.0.0.1 localhost $hostname
+EOF
+
+# if this was a block device, then umount it now
+if [ $mounted -eq 1 ]; then
+	umount $rootfs
+fi
+
+echo "'$lxc_new' created"
 
=== added file 'debian/patches/0007-fix-lxc-clone-hostname.patch'
--- debian/patches/0007-fix-lxc-clone-hostname.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0007-fix-lxc-clone-hostname.patch	2011-09-15 21:13:31 +0000
@@ -0,0 +1,31 @@
+Description: Define $hostname before its first use
+Author: Serge Hallyn <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/850205
+Forwarded: yes
+
+Index: f2/src/lxc/lxc-clone.in
+===================================================================
+--- f2.orig/src/lxc/lxc-clone.in	2011-09-15 15:33:15.981615000 -0500
++++ f2/src/lxc/lxc-clone.in	2011-09-15 15:33:39.262824554 -0500
+@@ -137,6 +137,8 @@
+     exit 1
+ fi
+ 
++hostname=$lxc_new
++
+ trap "${bindir}/lxc-destroy -n $lxc_new; echo aborted; exit 1" SIGHUP SIGINT SIGTERM
+ 
+ mkdir -p $lxc_path/$lxc_new
+@@ -184,11 +186,10 @@
+ fi
+ 
+ echo "Updating rootfs..."
+-hostname=$lxc_new
+ 
+ # so you can 'ssh $hostname.' or 'ssh $hostname.local'
+ if [ -f $rootfs/etc/dhcp/dhclient.conf ]; then
+-	sed -i "s/send host-name.*$/send host-name $hostname/" $rootfs/etc/dhcp/dhclient.conf
++	sed -i "s/send host-name.*$/send host-name $hostname;/" $rootfs/etc/dhcp/dhclient.conf
+ fi
+ 
+ # set the hostname
 
=== renamed file 'debian/patches/0007-fix-lxc-clone-hostname.patch' => 'debian/patches/0007-fix-lxc-clone-hostname.patch.moved'