From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 26 Aug 2015 15:07:06 +0000 (+0200)
Subject: turned off ipfwroot on f21-22; dhclient renamed in f22
X-Git-Tag: 5.3.10~28
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=120f503bf8a8858167ea150a65f2bd42de2644a6

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

diff --git a/config.lxc/bootcd.pkgs b/config.lxc/bootcd.pkgs
index 80d722fc..624dfa17 100644
--- 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 ccef3993..90b99f6a 100644
--- 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