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>

ubuntu: Make vim part of base template
d2305c4c · Stéphane Graber · f0ca2726 · d2305c4c
Unverified Commit d2305c4c authored Dec 10, 2013 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

lxc-ubuntu.in templates/lxc-ubuntu.in +3 -3

No files found.
--- 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