4 files changed, 39 insertions, 83 deletions
diff --git a/data/templates/dhcp-client/daemon-options.tmpl b/data/templates/dhcp-client/daemon-options.tmpl
index 12786b777..a0ba2c9ef 100644
--- a/data/templates/dhcp-client/daemon-options.tmpl
+++ b/data/templates/dhcp-client/daemon-options.tmpl
@@ -1 +1 @@
-DHCLIENT_OPTS="-nw -cf {{ conf_file }} -pf {{ pid_file }} -lf {{ lease_file }} {{ '-S' if dhcpv6_prm_only }} {{ '-T' if dhcpv6_temporary }} {{ ifname }}"
+DHCLIENT_OPTS="-nw -cf /var/lib/dhcp/dhclient_{{ifname}}.conf -pf /var/lib/dhcp/dhclient_{{ifname}}.pid -lf /var/lib/dhcp/dhclient_{{ifname}}.leases {{ifname}}"
diff --git a/data/templates/dhcp-client/ipv4.tmpl b/data/templates/dhcp-client/ipv4.tmpl
index ab772b5f6..fe2a67f08 100644
--- a/data/templates/dhcp-client/ipv4.tmpl
+++ b/data/templates/dhcp-client/ipv4.tmpl
@@ -4,14 +4,14 @@ timeout 60;
 retry 300;
 
 interface "{{ ifname }}" {
-	send host-name "{{ hostname }}";
-	{% if client_id -%}
-	send dhcp-client-identifier "{{ client_id }}";
-	{% endif -%}
-	{% if vendor_class_id -%}
-	send vendor-class-identifier "{{ vendor_class_id }}";
-	{% endif -%}
-	request subnet-mask, broadcast-address, routers, domain-name-servers,
-		rfc3442-classless-static-routes, domain-name, interface-mtu;
-	require subnet-mask;
+    send host-name "{{ dhcp_options.host_name }}";
+{% if dhcp_options.client_id is defined and dhcp_options.client_id is not none %}
+    send dhcp-client-identifier "{{ dhcp_options.client_id }}";
+{% endif %}
+{% if dhcp_options.vendor_class_id is defined and dhcp_options.vendor_class_id is not none %}
+    send vendor-class-identifier "{{ dhcp_options.vendor_class_id }}";
+{% endif %}
+    request subnet-mask, broadcast-address, routers, domain-name-servers,
+        rfc3442-classless-static-routes, domain-name, interface-mtu;
+    require subnet-mask;
 }
diff --git a/data/templates/dhcp-client/ipv6.tmpl b/data/templates/dhcp-client/ipv6.tmpl
index 490f14726..112431c5f 100644
--- a/data/templates/dhcp-client/ipv6.tmpl
+++ b/data/templates/dhcp-client/ipv6.tmpl
@@ -4,41 +4,44 @@
 interface {{ ifname }} {
     request domain-name-servers;
     request domain-name;
-{%  if dhcpv6_prm_only %}
+{% if dhcpv6_options is defined %}
+{%   if dhcpv6_options.parameters_only is defined %}
     information-only;
-{%  endif %}
-{%  if not dhcpv6_temporary %}
+{%    endif %}
+{%    if dhcpv6_options.temporary is not defined %}
     send ia-na 1; # non-temporary address
-{%  endif %}
-{%  if dhcpv6_pd_interfaces %}
+{%    endif %}
+{%    if dhcpv6_options.prefix_delegation is defined %}
     send ia-pd 2; # prefix delegation
+{%    endif %}
 {%  endif %}
 };
 
-{%  if not dhcpv6_temporary %}
+{% if dhcpv6_options is defined %}
+{%   if dhcpv6_options.temporary is not defined %}
 id-assoc na 1 {
     # Identity association NA
 };
-{%  endif %}
+{%   endif %}
 
-{%  if dhcpv6_pd_interfaces %}
+{%   if dhcpv6_options.prefix_delegation is defined %}
 id-assoc pd 2 {
-{%  if dhcpv6_pd_length %}
-    prefix ::/{{ dhcpv6_pd_length }} infinity;
-{%  endif %}
-{%  for intf in dhcpv6_pd_interfaces %}
-    prefix-interface {{ intf.ifname }} {
-{%    if intf.sla_id %}
-        sla-id {{ intf.sla_id }};
-{%    endif %}
-{%    if intf.sla_len %}
-        sla-len {{ intf.sla_len }};
-{%    endif %}
-{%    if intf.if_id %}
-        ifid {{ intf.if_id  }};
-{%    endif %}
+{%     if dhcpv6_options.prefix_delegation.length is defined %}
+    prefix ::/{{ dhcpv6_options.prefix_delegation.length }} infinity;
+{%     endif %}
+{%     for interface in dhcpv6_options.prefix_delegation.interface %}
+    prefix-interface {{ interface }} {
+{%       if dhcpv6_options.prefix_delegation.interface[interface].sla_id is defined %}
+        sla-id {{ dhcpv6_options.prefix_delegation.interface[interface].sla_id }};
+{%       endif %}
+{%       if dhcpv6_options.prefix_delegation.interface[interface].sla_len is defined %}
+        sla-len {{ dhcpv6_options.prefix_delegation.interface[interface].sla_len }};
+{%       endif %}
+{%       if dhcpv6_options.prefix_delegation.interface[interface].address is defined %}
+        ifid {{ dhcpv6_options.prefix_delegation.interface[interface].address }};
+{%       endif %}
     };
-{%  endfor %}
+{%     endfor %}
 };
-{%  endif %}
-
+{%   endif %}
+{% endif %}
diff --git a/data/templates/dhcp-client/ipv6_new.tmpl b/data/templates/dhcp-client/ipv6_new.tmpl
deleted file mode 100644
index 112431c5f..000000000
--- a/data/templates/dhcp-client/ipv6_new.tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-# generated by dhcp.py
-# man https://www.unix.com/man-page/debian/5/dhcp6c.conf/
-
-interface {{ ifname }} {
-    request domain-name-servers;
-    request domain-name;
-{% if dhcpv6_options is defined %}
-{%   if dhcpv6_options.parameters_only is defined %}
-    information-only;
-{%    endif %}
-{%    if dhcpv6_options.temporary is not defined %}
-    send ia-na 1; # non-temporary address
-{%    endif %}
-{%    if dhcpv6_options.prefix_delegation is defined %}
-    send ia-pd 2; # prefix delegation
-{%    endif %}
-{%  endif %}
-};
-
-{% if dhcpv6_options is defined %}
-{%   if dhcpv6_options.temporary is not defined %}
-id-assoc na 1 {
-    # Identity association NA
-};
-{%   endif %}
-
-{%   if dhcpv6_options.prefix_delegation is defined %}
-id-assoc pd 2 {
-{%     if dhcpv6_options.prefix_delegation.length is defined %}
-    prefix ::/{{ dhcpv6_options.prefix_delegation.length }} infinity;
-{%     endif %}
-{%     for interface in dhcpv6_options.prefix_delegation.interface %}
-    prefix-interface {{ interface }} {
-{%       if dhcpv6_options.prefix_delegation.interface[interface].sla_id is defined %}
-        sla-id {{ dhcpv6_options.prefix_delegation.interface[interface].sla_id }};
-{%       endif %}
-{%       if dhcpv6_options.prefix_delegation.interface[interface].sla_len is defined %}
-        sla-len {{ dhcpv6_options.prefix_delegation.interface[interface].sla_len }};
-{%       endif %}
-{%       if dhcpv6_options.prefix_delegation.interface[interface].address is defined %}
-        ifid {{ dhcpv6_options.prefix_delegation.interface[interface].address }};
-{%       endif %}
-    };
-{%     endfor %}
-};
-{%   endif %}
-{% endif %}