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

diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index bcc5a1ff..87bb2a1e 100644
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -2,8 +2,11 @@
 # 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 
+#
 package: kernel
-package: kernel-smp
 package: udev
 package: basesystem
 package: filesystem
@@ -29,15 +32,12 @@ 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
@@ -47,7 +47,6 @@ package: diffutils
 package: ethtool
 package: logrotate
 package: lsof
-package: logwatch
 package: mailcap
 package: nano
 package: nc
@@ -82,14 +81,32 @@ 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+fc4: util-linux
+package+fc6: util-linux
+package+f7: util-linux
+package+f8: util-linux-ng
+package+centos5: util-linux
+
 # not found on other platforms
 package+fc4: netdump
 package+fc4: schedutils
 package+fc4: SysVinit
-package+fc6: SysVinit
 package+fc4: portmap
+# 
+package+fc6: SysVinit
 package+fc6: portmap
+#
 # planetlab
+#
 package: madwifi
 package: wireless-tools
 package: util-vserver
@@ -105,10 +122,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
-# not ready yet
-#package: vsys
+package+f8: fprobe-ulog
+package: vsys
+package-fc4: vsys
+package-fc6: vsys
+package: monitor