[lxc-devel] [PATCH] Fix busybox template to not have extra aa_profile hunk

[Stéphane Graber]

On 11/29/2012 10:13 AM, Dwight Engen wrote:
> Both 69d66f1e and f02ce27d added the aa_profile = unconfined hunk, but only
> the first was needed, maybe a merge error? The second one causes the
> template to get an error on the EOF line. This essentially reverts
> f02ce27d.
> 
> Signed-off-by: Dwight Engen <dwight.engen at oracle.com>

Looks like something went wrong with the last rebase.

Acked-by: Stéphane Graber <stgraber at ubuntu.com>

Pushed to staging. Thanks

> ---
>  templates/lxc-busybox.in |    4 ----
>  1 files changed, 0 insertions(+), 4 deletions(-)
> 
> diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in
> index 581074c..f38d77e 100644
> --- a/templates/lxc-busybox.in
> +++ b/templates/lxc-busybox.in
> @@ -245,10 +245,6 @@ lxc.mount.entry=/usr/lib $rootfs/usr/lib none ro,bind 0 0
>  EOF
>  fi
>  
> -# When using LXC with apparmor, uncomment the next line to run unconfined:
> -#lxc.aa_profile = unconfined
> -EOF
> -
>      libdirs="\
>          lib \
>          usr/lib \
> 

-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 899 bytes
Desc: OpenPGP digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20121129/2b80aae1/attachment.pgp>