From 9dee9f18f2255bd4f1f7d9ad5bf55952d3391b4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Tue, 10 Sep 2013 11:38:10 +0200
Subject: [PATCH] =?UTF-8?q?[dhcp]=20ytrap-llatsni=20=C3=A0=20part?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bundler/isc-dhcp-server.xml | 8 +++++---
 Metadata/groups.xml         | 6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Bundler/isc-dhcp-server.xml b/Bundler/isc-dhcp-server.xml
index f477624..f1ea073 100644
--- a/Bundler/isc-dhcp-server.xml
+++ b/Bundler/isc-dhcp-server.xml
@@ -1,10 +1,12 @@
 <Bundle name="isc-dhcp-server">
     <Package name="isc-dhcp-server"/>
     <Service name="isc-dhcp-server"/>
-    <Path type="directory" name="/etc/dhcp3/generated"/>
     <Path type="symlink" name="/etc/dhcp" to="/etc/dhcp3"/>
     <Python name="/etc/dhcp3/dhcpd.conf"/>
-    <Python name="/etc/dhcp3/omapi.conf"/>
-    <Python name="/etc/dhcp3/dhcp-failover.conf"/>
+    <Group name="dhcp-dynamique" negate="true">
+        <Path type="directory" name="/etc/dhcp3/generated"/>
+        <Python name="/etc/dhcp3/omapi.conf"/>
+        <Python name="/etc/dhcp3/dhcp-failover.conf"/>
+    </Group>
 <!-- Conf générée par generate -->
 </Bundle>
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 4498cfb..bb20308 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -327,7 +327,7 @@
     <Group name="crans-domu-wheezy"/>
     <Group name="vlan-evenementiel"/>
 
-    <Group name="dhcp-server-primary"/>
+    <Group name="dhcp-dynamique"/>
     <Group name="dnsmasq"/>
     <Group name="clonepxe"/>
     <Bundle name="feteduslip"/>
@@ -657,6 +657,10 @@
     <Group name="isc-dhcp-server" />
   </Group>
 
+  <Group name="dhcp-dynamique">
+    <Bundle name="isc-dhcp-server"/>
+  </Group>
+
   <Group name="isc-dhcp-server">
     <Bundle name="isc-dhcp-server" />
     <Bundle name="generate"/>