[Lxc-users] [PATCH 5/2] lxc-ubuntu: always install lxcguest in postprocess

[Serge E. Hallyn]

Argh, sorry.  But this is it.  Now it works again :)

Now I'm going to stop with patches for a bit, and just keep stuff
in
https://code.launchpad.net/~serge-hallyn/ubuntu/oneiric/lxc/update-templates/

Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
---
 templates/lxc-ubuntu.in |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
index 60f5ae3..d6bc787 100644
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -86,10 +86,6 @@ download_ubuntu()
     else
         packages=dialog,apt,apt-utils,resolvconf,iproute,inetutils-ping,vim,isc-dhcp-client,isc-dhcp-common,ssh,lsb-release,gnupg,netbase
     fi
-    # If this is natty or newer, and we weren't asked to trim the container, then add lxcguest
-    if [ $release != "lucid" -a $release != "maverick" -a $trim_container -ne 1 ]; then
-        packages=$packages,lxcguest
-    fi
     echo "installing packages: $packages"
 
     # check the mini ubuntu was not already downloaded
@@ -324,8 +320,8 @@ post_process()
             chroot $rootfs apt-get install --force-yes -y python-software-properties
             chroot $rootfs add-apt-repository ppa:ubuntu-virt/ppa
             chroot $rootfs apt-get update
-            chroot $rootfs apt-get install --force-yes -y lxcguest
         fi
+        chroot $rootfs apt-get install --force-yes -y lxcguest
     fi
 }
 
-- 
1.7.4.1