X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config.planetlab%2Fbootcd.pkgs;h=e4d228a49ae6d455884ee884b3a9cfc09f69ac9f;hb=38239bbbb43ddbeaf8e64f89826a47ddc6aa5b50;hp=63cab0a0a6a07f47781269ddf2e9a06a36df61e1;hpb=305c3e9de9e68499fb99a7b48e35814ef9d94440;p=build.git

diff --git a/config.planetlab/bootcd.pkgs b/config.planetlab/bootcd.pkgs
index 63cab0a0..e4d228a4 100644
--- a/config.planetlab/bootcd.pkgs
+++ b/config.planetlab/bootcd.pkgs
@@ -1,9 +1,8 @@
 groupname: PlanetLabBootcd
 groupdesc: PlanetLab BootCD
-# 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
-# from prep.sh, was hardwired as packagelist
+# packages to exclude from stock repositories
+yumexclude: @NODEYUMEXCLUDE@
+# define packages
 package: filesystem
 package: udev
 package: dhclient
@@ -15,7 +14,6 @@ package: bzip2
 package: diffutils
 package: logrotate
 package: passwd
-#package: rsh
 package: rsync
 package: sudo
 package: tcpdump
@@ -34,7 +32,8 @@ package: authconfig
 package: hdparm
 package: lvm2
 package: kexec-tools
-package: gnupg
+package>=f8 package>=centos5: gnupg
+package>=sl6: gnupg2
 package: nano
 package: parted
 package: pyparted
@@ -49,7 +48,18 @@ package: vconfig
 package: ntp
 package: pypcilib
 package: openvpn
+package: btrfs-progs
+# make this explicit for f14 as we need mkfs.ext2 in bm
+package: e2fsprogs
+# used to be installed until f12, make it explicit for f14, might come in handy
+package>=f14: rsyslog 
+package: strace lsof
+
+# 03/2015: let's move on
+package: python3
+
 #################### formerly in prep.sh
+# probably very outdated..
 junk: lib/obsolete
 junk: lib/tls
 junk: usr/share/cracklib
@@ -68,6 +78,7 @@ junk: usr/lib/locale
 junk: usr/lib/sasl*
 junk: usr/lib/gconv
 junk: usr/lib/tls
+junk: usr/boot
 #
 precious: usr/share/i18n/locales/en_US
 precious: usr/share/i18n/charmaps/UTF-8.gz
@@ -76,4 +87,9 @@ precious: usr/share/terminfo/l/linux
 precious: usr/share/terminfo/v/vt100
 precious: usr/share/terminfo/x/xterm
 precious: usr/share/zoneinfo/UTC
-precious: usr/lib/locale/en_US.utf8
+precious: boot/*@pldistro@*
+precious: boot/config*
+precious: boot/initrd-boot*
+precious: boot/kernel-boot*
+precious: boot/grub
+precious<=f8 precious<=centos5: usr/lib/locale/en_US.utf8