From: Serge E. Hallyn <serge.hallyn@canonical.com>
Date: Sun, 7 Aug 2011 10:25:07 +0000 (+0200)
Subject: add ubuntu-keyring to the packagelist for oneiric containers.
X-Git-Tag: lxc-0.7.5~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e9c97c17a86ff52897bdb965182c36248cdb97a;p=thirdparty%2Flxc.git

add ubuntu-keyring to the packagelist for oneiric containers.

Otherwise apt fails during and after debootstrap.

Signed-off-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
index 0b59f26f7..6f509c9ab 100644
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -83,8 +83,10 @@ download_ubuntu()
         packages=dialog,apt,apt-utils,resolvconf,iproute,inetutils-ping,vim,dhcp3-client,ssh,lsb-release,gnupg
     elif [ $release = "maverick" ]; then
         packages=dialog,apt,apt-utils,resolvconf,iproute,inetutils-ping,vim,dhcp3-client,ssh,lsb-release,gnupg,netbase
-    else
+    elif [ $release = "natty" ]; then
         packages=dialog,apt,apt-utils,resolvconf,iproute,inetutils-ping,vim,isc-dhcp-client,isc-dhcp-common,ssh,lsb-release,gnupg,netbase
+    else
+        packages=dialog,apt,apt-utils,resolvconf,iproute,inetutils-ping,vim,isc-dhcp-client,isc-dhcp-common,ssh,lsb-release,gnupg,netbase,ubuntu-keyring
     fi
     echo "installing packages: $packages"