[lxc-devel] [PATCH] ubuntu: Make vim part of base template

[Serge Hallyn]

Quoting Stéphane Graber (stgraber at ubuntu.com):
> 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 at ubuntu.com>

Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

> ---
>  templates/lxc-ubuntu.in | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
> index d8ac22d..b0d328f 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
> -- 
> 1.8.5.1
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel