X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config.planetlab%2Fbootstrapfs.pkgs;h=4cb3a8e883ab7edb5b28f1c5ccee93733929f9d8;hb=748244fee4d13a41dfbdb6589c5d5337eeec0ce4;hp=79550e4566b2ca275bcbb9e603e121fcf19514f6;hpb=c4705890ed1bf5ea919c4c0f1878c99a443939c5;p=build.git

diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index 79550e45..4cb3a8e8 100644
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -2,6 +2,10 @@
 # groupname: Bootstrapfs
 groupname: PlanetLab
 groupdesc: PlanetLab Node Root
+# 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,20 +27,16 @@ package: libtermcap
 package: passwd
 package: procps
 package: readline
-package: fedora-release
 package: rootfiles
 package: rpm
 package: setserial
 package: setup
-package: sysklogd
 package: termcap
-package: util-linux
 package: vim-minimal
 package: shadow-utils
 package: anacron
 package: at
 package: authconfig
-package: autofs
 package: bc
 package: bind-utils
 package: bzip2
@@ -45,8 +45,8 @@ package: dhclient
 package: diffutils
 package: ethtool
 package: logrotate
+package: libnl
 package: lsof
-package: logwatch
 package: mailcap
 package: nano
 package: nc
@@ -81,14 +81,21 @@ 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
+
+#
+# platform-dependent
+#
+package: rsyslog
+package-centos5: rsyslog
+package+centos5: sysklogd
+
+package: util-linux-ng
+package-centos5: util-linux-ng
+package+centos5: util-linux
+
+#
 # planetlab
+#
 package: madwifi
 package: wireless-tools
 package: util-vserver
@@ -104,13 +111,9 @@ 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: monitor-client