Merge lp:~ubuntu-branches/ubuntu/quantal/lxc/quantal-201206250626 into lp:ubuntu/quantal/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/quantal/lxc reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/quantal/lxc/quantal-201206250626. 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

114. By Stéphane Graber on 2012-06-25

releasing version 0.8.0~rc1-4ubuntu15

113. By Stéphane Graber on 2012-06-25

Update apparmor profiles to fix nesting

112. By Stéphane Graber on 2012-06-19

No bashism in lxc-aa-custom-profile so make it use /bin/sh

111. By Stéphane Graber on 2012-06-19

Make the remaining scripts executable

110. By Stéphane Graber on 2012-06-19

Merge new lxc-aa-custom-profile tool from Serge Hallyn

=== added file 'debian/local/lxc-aa-custom-profile'
--- debian/local/lxc-aa-custom-profile	1970-01-01 00:00:00 +0000
+++ debian/local/lxc-aa-custom-profile	2012-06-25 06:34:25 +0000
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+set -e
+
+_OPTIONS="$(getopt -o n: -l name: -- "${@}")"
+
+if [ "${?}" -ne 0 ]
+then
+	echo "Usage: $(basename ${0}) -n|--name CONTAINER" >&2
+	echo "  creates a custom profile (copied from the default) for CONTAINER"
+	exit 1
+fi
+
+eval set -- "${_OPTIONS}"
+
+while true
+do
+	case "${1}" in
+		-n|--name)
+			_CONTAINER="${2}"
+			shift 2
+			;;
+
+		--)
+			shift
+			break
+			;;
+
+		*)
+			echo "E: $(basename ${0}): internal error ${0}" >&2
+			exit 1
+			;;
+	esac
+done
+
+if [ `id -u` -ne 0 ]; then
+	echo "E: $(basename ${0}): must run with privilege"
+	exit 1
+fi
+
+if [ -z "${_CONTAINER}" ]
+then
+	echo "E: $(basename ${0}): missing container name, use --name option" >&2
+	exit 1
+fi
+
+if [ ! -f /var/lib/lxc/${_CONTAINER}/config ]; then
+	echo "E: $(basename ${0}): /var/lib/lxc/${_CONTAINER}/config - no such file"
+	exit 1
+fi
+
+profile="lxc-${_CONTAINER}"
+if [ -f /etc/apparmor.d/lxc/${profile} ]; then
+	echo "E: $(basename ${0}): custom profile already exists"
+	exit 1
+fi
+
+if [ ! -f /etc/apparmor.d/lxc/lxc-default ]; then
+	echo "E: $(basename ${0}): default profile does not exist!"
+	exit 1
+fi
+
+cp -f /etc/apparmor.d/lxc/lxc-default /etc/apparmor.d/lxc/${profile}
+sed -i "s/profile lxc-container-default/profile ${profile}/" /etc/apparmor.d/lxc/${profile}
+
+sed -i '/lxc.aa_profile/d' /var/lib/lxc/${_CONTAINER}/config
+echo "lxc.aa_profile = ${profile}" >> /var/lib/lxc/${_CONTAINER}/config
+
+/lib/init/apparmor-profile-load lxc-containers
+
+echo "Profile for ${_CONTAINER} updated.  Edit /etc/apparmor.d/lxc/${profile} to customize."

=== renamed file 'debian/local/lxc-aa-custom-profile' => 'debian/local/lxc-aa-custom-profile.moved'
=== modified file 'debian/lxc.install'
--- debian/lxc.install	2012-06-25 01:34:12 +0000
+++ debian/lxc.install	2012-06-25 06:34:25 +0000
@@ -14,7 +14,12 @@
 debian/local/lxc-list		/usr/bin
 debian/local/lxc-restore	/usr/bin
 debian/local/lxc.sh		/etc/bash_completion.d
+<<<<<<< TREE
 debian/local/lxc-start-ephemeral     /usr/bin
 debian/local/lxc-aa-custom-profile  /usr/bin
+=======
+debian/local/lxc-start-ephemeral   /usr/bin
+debian/local/lxc-aa-custom-profile  /usr/bin
+>>>>>>> MERGE-SOURCE
 
 debian/lxc.conf etc/lxc/