3 files changed, 43 insertions, 5 deletions
diff --git a/data/templates/dhcp-client/daemon-options.tmpl b/data/templates/dhcp-client/daemon-options.tmpl
new file mode 100644
index 000000000..b5a10c3b8
--- /dev/null
+++ b/data/templates/dhcp-client/daemon-options.tmpl
@@ -0,0 +1 @@
+DHCLIENT_OPTS="-nw -cf {{ conf_file }} -pf {{ pid_file }} -lf {{ lease_file }} {{ '-S' if dhcpv6_prm_only }} {{ '-T' if dhcpv6_temporary }} {{ ifname }}"
diff --git a/data/templates/dhcp-client/ipv4.tmpl b/data/templates/dhcp-client/ipv4.tmpl
index 43f273077..ab772b5f6 100644
--- a/data/templates/dhcp-client/ipv4.tmpl
+++ b/data/templates/dhcp-client/ipv4.tmpl
@@ -1,4 +1,4 @@
-# generated by ifconfig.py
+# generated by dhcp.py
 option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;
 timeout 60;
 retry 300;
diff --git a/data/templates/dhcp-client/ipv6.tmpl b/data/templates/dhcp-client/ipv6.tmpl
index 83db40c5f..6cfe24d3e 100644
--- a/data/templates/dhcp-client/ipv6.tmpl
+++ b/data/templates/dhcp-client/ipv6.tmpl
@@ -1,4 +1,41 @@
-# generated by ifconfig.py
-interface "{{ ifname }}" {
-	request routers, domain-name-servers, domain-name;
-}
+# 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_prm_only %}
+    information-only;
+{%  endif %}
+{%  if not dhcpv6_temporary %}
+    send ia-na 1; # non-temporary address
+{%  endif %}
+{%  if dhcpv6_pd %}
+    send ia-pd 2; # prefix delegation
+{%  endif %}
+};
+
+{%  if not dhcpv6_temporary %}
+id-assoc na 1 {
+    # Identity association NA
+};
+{%  endif %}
+
+{%  if dhcpv6_pd %}
+id-assoc pd 2 {
+{%  for intf in dhcpv6_pd %}
+    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 %}
+    };
+{%  endfor %}
+};
+{%  endif %}
+