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

diff --git a/config.lxc/bootcd.pkgs b/config.lxc/bootcd.pkgs
index a72bcc2..cc3c9ea 100644 (file)
--- 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 0457d8a..2a2e96b 100644 (file)
--- 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