From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 21 Feb 2013 10:19:48 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build
X-Git-Tag: 5.2.1~41
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7fdcb980506a04b343508700163cdaba86d916b7;hp=6b65578800926f7b18326d8f81669a23dc873233;p=build.git

Merge branch 'master' of ssh://git.onelab.eu/git/build
---

diff --git a/config.lxc/bootcd.pkgs b/config.lxc/bootcd.pkgs
index a72bcc22..cc3c9eaf 100644
--- a/config.lxc/bootcd.pkgs
+++ b/config.lxc/bootcd.pkgs
@@ -49,6 +49,7 @@ package: vconfig
 package: ntp
 package: pypcilib
 package: openvpn
+package: vim-enhanced
 # make this explicit for f14 as we need mkfs.ext2 in bm
 package: e2fsprogs
 # used to be installed until f12, make it explicit for f14, might come in handy
diff --git a/config.lxc/nodeimage.pkgs b/config.lxc/nodeimage.pkgs
index 0457d8ac..2a2e96bc 100644
--- a/config.lxc/nodeimage.pkgs
+++ b/config.lxc/nodeimage.pkgs
@@ -43,7 +43,7 @@ package: rootfiles
 package: rpm
 package: setserial
 package: setup
-package: vim-minimal
+package: vim-enhanced
 package: shadow-utils
 package>=centos5: anacron
 package<=f10: anacron