From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 21 Jan 2010 11:59:42 +0000 (+0000)
Subject: add emacs to the onelab bootstrapfs, and fix cronie on fedora10 and up for planetlab... 
X-Git-Tag: 4.3-rc17~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6681319de6c2e7f26b6d115d898ac5adc87a7b8a;p=build.git

add emacs to the onelab bootstrapfs, and fix cronie on fedora10 and up for planetlab bootstrapfs
---

diff --git a/config.onelab/bootstrapfs.pkgs b/config.onelab/bootstrapfs.pkgs
index b7e10c84..12836f99 100644
--- a/config.onelab/bootstrapfs.pkgs
+++ b/config.onelab/bootstrapfs.pkgs
@@ -94,13 +94,9 @@ package=centos5: util-linux
 package<=f8 package=centos5: termcap libtermcap vixie-cron
 package>=f10: cronie
 
-# for nagios
-package: nrpe
-
 #
 # planetlab
 #
-package: ipfwroot
 package: madwifi
 package: wireless-tools
 package: util-vserver
@@ -124,3 +120,11 @@ package: vsys
 package: vsys-scripts
 package: monitor-client
 package: monitor-runlevelagent
+
+# onelab specifics
+# kernel-ipfw
+package: ipfwroot
+# for nagios
+package: nrpe
+# convenience
+package: emacs
diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index 621a1f95..14f2e8e0 100644
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -92,7 +92,7 @@ package>=f8: util-linux-ng
 package=centos5: util-linux
 
 package<=f8 package=centos5: termcap libtermcap vixie-cron
-package>f10: cronie
+package>=f10: cronie
 
 #
 # planetlab