reviewed all slice contents :

added bind_public and dhclient to OL slice for running inside lxc
added nc as a convenience in PL and ML slice
added ipfwslice and vsys-wrapper in LXC

diff --git a/config.lxc/sliceimage.pkgs b/config.lxc/sliceimage.pkgs
index 2c6a506..1b67136 100644 (file)
--- a/config.lxc/sliceimage.pkgs
+++ b/config.lxc/sliceimage.pkgs
@@ -3,38 +3,37 @@ 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: 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 
+package: telnet nc
 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
+
 package: cronie
-# preinstall this 
+
+# xxx not entirely sure this is required any more
+package: openssh-server
+
+# required for lxc-based nodes
+package: dhclient
+# a PL-specific, also required on lxc-based nodes
+package: bind_public
+
+package: vsyssh
+package: vsys-wrapper
+
+# onelab additions
 package: sliver-openvswitch
+package: ipfwslice
+

diff --git a/config.mlab/sliceimage.pkgs b/config.mlab/sliceimage.pkgs
index 8bf0bb0..3596abc 100644 (file)
--- a/config.mlab/sliceimage.pkgs
+++ b/config.mlab/sliceimage.pkgs
@@ -3,37 +3,31 @@ groupname: PlanetLabSlice
 groupdesc: PlanetLab Slice Reference Image
 # packages to exclude from stock repositories
 yumexclude: @NODEYUMEXCLUDE@
-# define packages
-package: bash
-package: coreutils
-package: iputils
+
+# kind-of a hack for for vs-based stuff
 package: kernel-vserver
-package: bzip2
-package: crontabs
-package: diffutils
-package: logrotate
+
+package: filesystem bash coreutils
+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: tcpdump traceroute 
+package: telnet nc
 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: vim-enhanced
+# this is really old school but well..
+package: rsh which
 
 package<=f8 package=centos5: vixie-cron
 package>=f10: cronie
+
+package: vim-enhanced
 package=centos6: epel-release
+
+# xxx might need to add bind_public and dhclient
+# for running in an lxc node

diff --git a/config.onelab/sliceimage.pkgs b/config.onelab/sliceimage.pkgs
index c9d1aa3..e9bb1a4 100644 (file)
--- a/config.onelab/sliceimage.pkgs
+++ b/config.onelab/sliceimage.pkgs
@@ -3,42 +3,38 @@ groupname: PlanetLabSlice
 groupdesc: PlanetLab Slice Reference Image
 # packages to exclude from stock repositories
 yumexclude: @NODEYUMEXCLUDE@
-# define packages
-package: bash
-package: coreutils
-package: iputils
+
+# kind-of a hack for for vs-based stuff
 package: kernel-vserver
-package: bzip2
-package: crontabs
-package: diffutils
-package: logrotate
+
+package: filesystem bash coreutils
+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: tcpdump traceroute 
+package: telnet nc
 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:nc
+# this is really old school but well..
+package: rsh which
 
 package<=f8 package=centos5: vixie-cron
 package>=f10: cronie
 
-package: planetlab-umts-tools-frontend
-package: ipfwslice
+# required for lxc-based nodes
+package: dhclient
+# a PL-specific, also required on lxc-based nodes
+package: bind_public
+
 package: vsyssh
-package: sliver-openvswitch
 package: vsys-wrapper
+
+package: sliver-openvswitch
+
+package: planetlab-umts-tools-frontend
+package: ipfwslice

diff --git a/config.planetlab/sliceimage.pkgs b/config.planetlab/sliceimage.pkgs
index 58b1962..7323b68 100644 (file)
--- a/config.planetlab/sliceimage.pkgs
+++ b/config.planetlab/sliceimage.pkgs
@@ -3,35 +3,28 @@ groupname: PlanetLabSlice
 groupdesc: PlanetLab Slice Reference Image
 # packages to exclude from stock repositories
 yumexclude: @NODEYUMEXCLUDE@
-# define packages
-package: bash
-package: coreutils
-package: iputils
+
+# kind-of a hack for for vs-based stuff
 package: kernel-vserver
-package: bzip2
-package: crontabs
-package: diffutils
-package: logrotate
+
+package: filesystem bash coreutils
+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: tcpdump traceroute 
+package: telnet nc
 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
+# this is really old school but well..
+package: rsh which
 
 package<=f8 package=centos5: vixie-cron
 package>=f10: cronie
+
+# xxx might need to add bind_public and dhclient
+# for running in an lxc node