From: Stéphane Graber <stgraber@ubuntu.com>
Date: Tue, 10 Dec 2013 23:04:07 +0000 (-0500)
Subject: ubuntu: Make vim part of base template
X-Git-Tag: lxc-1.0.0.beta1~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2305c4cde1676c606d1d50a0202821bdc8e7d24;p=thirdparty%2Flxc.git

ubuntu: Make vim part of base template

This moves vim back to the default list of packages, drops the duplicate
ssh entry which means that unless extra packages are passed through
--packages, container creation won't invoke apt-get anymore.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
index d8ac22dae..b0d328f2a 100644
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -248,7 +248,7 @@ download_ubuntu()
     arch=$2
     release=$3
 
-    packages_template=${packages_template:-"ssh"}
+    packages_template=${packages_template:-"ssh vim"}
 
     # Try to guess a list of langpacks to install
     langpacks="language-pack-en"
@@ -507,7 +507,7 @@ EOF
     fi
 
     # Install Packages in container
-    if [ -n $packages ]
+    if [ -n "$packages" ]
     then
         local packages="`echo $packages | sed 's/,/ /g'`"
         echo "Installing packages: ${packages}"
@@ -631,7 +631,7 @@ fi
 debug=0
 hostarch=$arch
 flushcache=0
-packages="vim,ssh"
+packages=""
 user="ubuntu"
 password="ubuntu"
 while true