Skip to content

L
lxc
Unverified Commit d2305c4c by Stéphane Graber
Options

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: 's avatarStéphane Graber <stgraber@ubuntu.com> Acked-by: 's avatarSerge E. Hallyn <serge.hallyn@ubuntu.com>
parent f0ca2726
Showing with 3 additions and 3 deletions
templates/lxc-ubuntu.in
...@@ -248,7 +248,7 @@ download_ubuntu() ...@@ -248,7 +248,7 @@ download_ubuntu()
arch=$2 arch=$2
release=$3 release=$3
packages_template=${packages_template:-"ssh"} packages_template=${packages_template:-"ssh vim"}
# Try to guess a list of langpacks to install # Try to guess a list of langpacks to install
langpacks="language-pack-en" langpacks="language-pack-en"
...@@ -507,7 +507,7 @@ EOF ...@@ -507,7 +507,7 @@ EOF
fi fi
# Install Packages in container # Install Packages in container
if [ -n $packages ] if [ -n "$packages" ]
then then
local packages="`echo $packages | sed 's/,/ /g'`" local packages="`echo $packages | sed 's/,/ /g'`"
echo "Installing packages: ${packages}" echo "Installing packages: ${packages}"
...@@ -631,7 +631,7 @@ fi ...@@ -631,7 +631,7 @@ fi
debug=0 debug=0
hostarch=$arch hostarch=$arch
flushcache=0 flushcache=0
packages="vim,ssh" packages=""
user="ubuntu" user="ubuntu"
password="ubuntu" password="ubuntu"
while true while true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment