X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config.planetlab%2Fbootstrapfs.pkgs;h=591b45ed9c9586b6091f23715cd3e7c7e1676e53;hb=32bc1fd57cddecd68c0cd6a157b840a98d560e37;hp=4f05cccebd5612bba065162e32942a0637ba1f58;hpb=62bafa641ee4ad935039fa5e12d46e7689e0b500;p=build.git

diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index 4f05ccce..591b45ed 100644
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -2,10 +2,10 @@
 # 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* ulogd 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
@@ -23,30 +23,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+fc4: sysklogd
-package+fc6: sysklogd
-package+f7: sysklogd
-package+f8: rsyslog
-package: termcap
-package+fc4: util-linux
-package+fc6: util-linux
-package+f7: util-linux
-package+f8: util-linux-ng
 package: vim-minimal
 package: shadow-utils
 package: anacron
 package: at
 package: authconfig
-package: autofs
 package: bc
 package: bind-utils
 package: bzip2
@@ -55,8 +43,8 @@ package: dhclient
 package: diffutils
 package: ethtool
 package: logrotate
+package: libnl
 package: lsof
-package: logwatch
 package: mailcap
 package: nano
 package: nc
@@ -75,7 +63,6 @@ package: time
 package: tmpwatch
 package: tcpdump
 package: openssh-server
-package: vixie-cron
 package: wget
 package: yum
 package: curl
@@ -91,14 +78,26 @@ package: nfs-utils
 package: openvpn
 package: vconfig
 package: PyXML
-# not found on other platforms
-package+fc4: netdump
-package+fc4: schedutils
-package+fc4: SysVinit
-package+fc6: SysVinit
-package+fc4: portmap
-package+fc6: portmap
+
+package: termcap libtermcap
+package: vixie-cron
+
+#
+# platform-dependent
+#
+package: rsyslog
+package-centos5: rsyslog
+package+centos5: sysklogd
+
+package: util-linux-ng
+package-centos5: util-linux-ng
+package+centos5: util-linux
+
+package-f10: termcap libtermcap
+package-f10: vixie-cron
+#
 # planetlab
+#
 package: madwifi
 package: wireless-tools
 package: util-vserver
@@ -114,13 +113,11 @@ package: NodeUpdate
 package: codemux
 package: pl_sshd
 package: ipod
-package: vserver-reference
-package: vserver-system-packages
+package: vserver-@pldistro@-@fcdistro@-@arch@
+package: vserver-systemslices-@pldistro@-@fcdistro@-@arch@
 package: pl_mom
-package: netflow-utils
-package: proper
-package+f8: fprobe-ulog
-# for vsys
-#package+f8: ocaml ocaml-docs
-#package+f8: inotify-tools-devel 
-package+f8: vsys
+package: fprobe-ulog
+package: vsys
+package: vsys-scripts
+package: monitor-client
+package: monitor-runlevelagent