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

diff --git a/config.onelab/bootstrapfs.pkgs b/config.onelab/bootstrapfs.pkgs
index b7e10c8..12836f9 100644 (file)
--- 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 621a1f9..14f2e8e 100644 (file)
--- 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