5 files changed, 10 insertions, 7 deletions
diff --git a/data/templates/accel-ppp/pppoe.config.tmpl b/data/templates/accel-ppp/pppoe.config.tmpl
index 99b3923b2..aece47a66 100644
--- a/data/templates/accel-ppp/pppoe.config.tmpl
+++ b/data/templates/accel-ppp/pppoe.config.tmpl
@@ -114,12 +114,14 @@ dae-server={{ radius_dynamic_author.server }}:{{ radius_dynamic_author.port }},{
 {% endif -%}
 {% endif %}
 
+{% if sesscrtl != 'disable' %}
+[common]
+single-session={{ sesscrtl }}
+{% endif %}
+
 [ppp]
 verbose=1
 check-ip=1
-{% if not sesscrtl == 'disable' %}
-single-session={{sesscrtl}}
-{% endif -%}
 {% if ppp_ccp %}
 ccp=1
 {% endif %}
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..be0235add 100644
--- a/data/templates/dhcp-client/ipv6.tmpl
+++ b/data/templates/dhcp-client/ipv6.tmpl
@@ -1,4 +1,4 @@
-# generated by ifconfig.py
+# generated by dhcp.py
 interface "{{ ifname }}" {
 	request routers, domain-name-servers, domain-name;
 }
diff --git a/data/templates/dhcpv6-server/dhcpdv6.conf.tmpl b/data/templates/dhcpv6-server/dhcpdv6.conf.tmpl
index 80d620fcf..d6b0ae935 100644
--- a/data/templates/dhcpv6-server/dhcpdv6.conf.tmpl
+++ b/data/templates/dhcpv6-server/dhcpdv6.conf.tmpl
@@ -21,7 +21,7 @@ shared-network {{ network.name }} {
         range6 {{ range.start }} {{ range.stop }};
         {%- endfor %}
         {%- if subnet.domain_search %}
-        option dhcp6.domain-search {{ subnet.domain_search | join(', ') }};
+        option dhcp6.domain-search "{{ subnet.domain_search | join('", "') }}";
         {%- endif %}
         {%- if subnet.lease_def %}
         default-lease-time {{ subnet.lease_def }};
@@ -51,7 +51,7 @@ shared-network {{ network.name }} {
         option dhcp6.sip-servers-addresses {{ subnet.sip_address | join(', ') }};
         {%- endif %}
         {%- if subnet.sip_hostname %}
-        option dhcp6.sip-servers-names {{ subnet.sip_hostname | join(', ') }};
+        option dhcp6.sip-servers-names "{{ subnet.sip_hostname | join('", "') }}";
         {%- endif %}
         {%- if subnet.sntp_server %}
         option dhcp6.sntp-servers {{ subnet.sntp_server | join(', ') }};