X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config.planetlab%2Fbootstrapfs.pkgs;h=14f2e8e02be20fe005c2e8a7ef528ee43f456bdc;hb=b1fc8046eb1834b99fda1aeef94a62bab878e766;hp=87bb2a1e6588d4b47a8835513824e4996513353a;hpb=28fd8e15566f0aef92de84d59b2306d9efe46c28;p=build.git

diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index 87bb2a1e..14f2e8e0 100644
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -1,11 +1,14 @@
+# $Id$
+# $URL$
+#
 # Keeping the old name as it might be referenced elsewhere (node update..)
 # groupname: Bootstrapfs
 groupname: PlanetLab
 groupdesc: PlanetLab Node Root
-# This is the replacement for the former mkfedora -k. The following packages
-# will get excluded from the stock fedora repos, as we need to use ours
-kexclude: kernel* util-vserver* iptables iproute 
-#
+# packages to exclude from stock repositories
+kexclude: @KEXCLUDE@
+# fedora-release or centos-release are pulled from deps
+# define packages
 package: kernel
 package: udev
 package: basesystem
@@ -23,16 +26,13 @@ package: initscripts
 package: iproute
 package: iputils
 package: kbd
-package: libtermcap
 package: passwd
 package: procps
 package: readline
-package: fedora-release
 package: rootfiles
 package: rpm
 package: setserial
 package: setup
-package: termcap
 package: vim-minimal
 package: shadow-utils
 package: anacron
@@ -46,6 +46,7 @@ package: dhclient
 package: diffutils
 package: ethtool
 package: logrotate
+package: libnl
 package: lsof
 package: mailcap
 package: nano
@@ -65,7 +66,6 @@ package: time
 package: tmpwatch
 package: tcpdump
 package: openssh-server
-package: vixie-cron
 package: wget
 package: yum
 package: curl
@@ -81,29 +81,19 @@ package: nfs-utils
 package: openvpn
 package: vconfig
 package: PyXML
+
 #
 # platform-dependent
 #
-package+fc4: sysklogd
-package+fc6: sysklogd
-package+f7: sysklogd
-package+f8: rsyslog
-package+centos5: sysklogd
+package>=f8: rsyslog
+package=centos5: sysklogd
+
+package>=f8: util-linux-ng
+package=centos5: util-linux
 
-package+fc4: util-linux
-package+fc6: util-linux
-package+f7: util-linux
-package+f8: util-linux-ng
-package+centos5: util-linux
+package<=f8 package=centos5: termcap libtermcap vixie-cron
+package>=f10: cronie
 
-# not found on other platforms
-package+fc4: netdump
-package+fc4: schedutils
-package+fc4: SysVinit
-package+fc4: portmap
-# 
-package+fc6: SysVinit
-package+fc6: portmap
 #
 # planetlab
 #
@@ -125,8 +115,8 @@ package: ipod
 package: vserver-@pldistro@-@fcdistro@-@arch@
 package: vserver-systemslices-@pldistro@-@fcdistro@-@arch@
 package: pl_mom
-package+f8: fprobe-ulog
+package: fprobe-ulog
 package: vsys
-package-fc4: vsys
-package-fc6: vsys
-package: monitor
+package: vsys-scripts
+package: monitor-client
+package: monitor-runlevelagent