X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config.planetlab%2Fbootstrapfs.pkgs;h=d38ba95dc6a2d2547fc1ce2d88eeb39a9eb2c0bb;hb=afaa75e59f1ff47178633823c9441fcefb020613;hp=4c7cd5843f10318c640b746096d6da29b9a4a887;hpb=8ea3a2e9d5ae5337937f6d65b030994ee7ea6f80;p=build.git

diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index 4c7cd584..d38ba95d 100644
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -1,15 +1,17 @@
+#
 # 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* iptables
-#
+# 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
 package: filesystem
+package>=f14: lvm2
 package: bash
 package: coreutils
 package: python
@@ -23,19 +25,18 @@ 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
+package>=centos5: anacron
+package<=f10: anacron
+package>=f12: cronie-anacron
 package: at
 package: authconfig
 package: bc
@@ -46,8 +47,8 @@ package: dhclient
 package: diffutils
 package: ethtool
 package: logrotate
+package: libnl
 package: lsof
-package: logwatch
 package: mailcap
 package: nano
 package: nc
@@ -66,13 +67,14 @@ package: time
 package: tmpwatch
 package: tcpdump
 package: openssh-server
-package: vixie-cron
 package: wget
 package: yum
 package: curl
 package: gzip
 package: iptables
-package: mkinitrd
+package>=centos5: mkinitrd
+package<=f12: mkinitrd
+package>=f14: dracut
 package: ntp
 package: perl
 package: python
@@ -82,29 +84,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
 #
@@ -126,8 +118,9 @@ 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
+package: pyplnet