turned off ipfwroot on f21-22; dhclient renamed in f22

diff --git a/config.lxc/bootcd.pkgs b/config.lxc/bootcd.pkgs
index 80d722f..624dfa1 100644 (file)
--- a/config.lxc/bootcd.pkgs
+++ b/config.lxc/bootcd.pkgs
@@ -5,7 +5,8 @@ yumexclude: @NODEYUMEXCLUDE@
 # define packages
 package: btrfs-progs
 package: filesystem
-package: dhclient
+package<=f21: dhclient
+package>=f22: dhcp-client
 package: bash
 package: coreutils
 package: iputils

diff --git a/config.lxc/nodeimage.pkgs b/config.lxc/nodeimage.pkgs
index ccef399..90b99f6 100644 (file)
--- a/config.lxc/nodeimage.pkgs
+++ b/config.lxc/nodeimage.pkgs
@@ -4,7 +4,8 @@
 groupname: PlanetLab
 groupdesc: PlanetLab Node Root
 # our own modules
-package: ipfwroot
+# turned off - hopefully on a temporary basis
+#package: ipfwroot
 package: lxc-userspace
 package: transforward
 # temporarily turned off as it won't build on recent kernels