X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config.lxc%2Fsliceimage.pkgs;h=b131989ec9f39e9e4502e543e6039d6f1b3b429e;hb=54d3133eeb801a434a1237c2cde942cc45bb8539;hp=2c6a506b12e240f2cf5a197672dc56bda1177d69;hpb=04f55606d33b86ba19fa7203487d959f56d7eafc;p=build.git

diff --git a/config.lxc/sliceimage.pkgs b/config.lxc/sliceimage.pkgs
index 2c6a506b..b131989e 100644
--- a/config.lxc/sliceimage.pkgs
+++ b/config.lxc/sliceimage.pkgs
@@ -3,38 +3,57 @@ groupname: PlanetLabSlice
 groupdesc: PlanetLab Slice Reference Image
 # packages to exclude from stock repositories
 yumexclude: @NODEYUMEXCLUDE@
-# define packages
-package: bash
-package: coreutils
+
+package: filesystem bash coreutils
+package>=f24: systemd-udev
+# adding this seems to create a dangling btrfs subvolume in
+# /vservers/<>/var/lib/machines
+# package>=f24: systemd-container
+package: findutils diffutils
+package: crontabs logrotate passwd sudo
+package: gzip bzip2 tar rsync
+package: wget curl
+package: perl
+package: python python-devel
+package: yum
 package: iputils
-package: bzip2
-package: crontabs
-package: diffutils
-package: logrotate
+package: tcpdump traceroute telnet
+package<=f18: nc
+package>=f20: nmap-ncat
 package: openssh-clients
-package: passwd
-package: rsh
-package: rsync
-package: sudo
-package: tcpdump
-package: telnet
-package: traceroute
 package: time
-package: wget
-package: which
-package: yum
-package: curl
-package: gzip
-package: perl
-package: python
-package: python-devel
-package: tar
-package: findutils
-package: filesystem
-package: vsyssh
-package: bind_public
-# libvirt lxc containers need this so they can start up their network
-package: openssh-server dhclient
+# this is really old school but well..
+package: rsh which
+# required for the test suite to suceed
+# before f23 this somehow ended up on the slice anyway
+package: procps-ng
+
 package: cronie
-# preinstall this 
-package: sliver-openvswitch
+
+# xxx not entirely sure this is required any more
+package: openssh-server
+
+# for ifconfig
+package: net-tools
+
+# required for lxc-based nodes
+package<=f21: dhclient
+package>=f22: dhcp-client
+# we need /etc/sysconfig/network-scripts
+# which won't show up on its own in f23
+package>=f23: initscripts
+# a PL-specific, also required on lxc-based nodes
+package: bind_public
+
+package: vsyssh
+package: vsys-wrapper
+
+# onelab additions
+package<=f27: sliver-openvswitch
+package: ipfwslice
+
+# convenience
+package: less emacs-nox
+
+# 03/2015: let's move on
+package: python3