diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-29 15:06:38 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-04-29 15:06:38 +0200 |
| commit | 1d909e0c5358a0d733baffe6cd533d21927ed147 (patch) | |
| tree | d84b35bea5b80452414c8083798fa3e59516cd94 /data | |
| parent | 867a0b71acc3f1cbbcfad553952bdbc82070ae4b (diff) | |
| parent | fc3ceac0160db30d49d9b8bb2417934c9b399db4 (diff) | |
| download | vyos-1x-1d909e0c5358a0d733baffe6cd533d21927ed147.tar.gz vyos-1x-1d909e0c5358a0d733baffe6cd533d21927ed147.zip | |
Merge branch 'systemd-dhclient' of github.com:c-po/vyos-1x into current
* 'systemd-dhclient' of github.com:c-po/vyos-1x:
dhclient: T2393: remove intermediate _DHCP helper class
dhclient6: T2393: T2394: migrate from SysVinit to systemd
dhclient: T2393: migrate from SysVinit to systemd
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/dhcp-client/daemon-options.tmpl | 1 | ||||
| -rw-r--r-- | data/templates/dhcp-client/ipv4.tmpl | 2 | ||||
| -rw-r--r-- | data/templates/dhcp-client/ipv6.tmpl | 2 |
3 files changed, 3 insertions, 2 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..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; } |