diff options
| author | Christian Pössinger <Christian.Poessinger@rohde-schwarz.com> | 2020-08-14 07:39:05 +0200 |
|---|---|---|
| committer | Christian Pössinger <Christian.Poessinger@rohde-schwarz.com> | 2020-08-14 07:39:50 +0200 |
| commit | 9a85c946e5f4d125276da432bb3055d1369d47fd (patch) | |
| tree | 2c70c5a8cca60897bb561a22b096b12946c98cfa | |
| parent | 94d697f5e161293f92a42f88aafc10c7955dda73 (diff) | |
| download | vyos-1x-9a85c946e5f4d125276da432bb3055d1369d47fd.tar.gz vyos-1x-9a85c946e5f4d125276da432bb3055d1369d47fd.zip | |
templates: dhcp-client: fix "Autogenerated by" script name
Commit 21bc98f1 ("ifconfig: dhcp: T2767: client must not start when
interface is disabled") dropped dhcp.py which is now directly handled by
interface.py. This change should also be reflected in the generated files.
| -rw-r--r-- | data/templates/dhcp-client/daemon-options.tmpl | 3 | ||||
| -rw-r--r-- | data/templates/dhcp-client/ipv4.tmpl | 4 | ||||
| -rw-r--r-- | data/templates/dhcp-client/ipv6.tmpl | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/data/templates/dhcp-client/daemon-options.tmpl b/data/templates/dhcp-client/daemon-options.tmpl index a0ba2c9ef..290aefa49 100644 --- a/data/templates/dhcp-client/daemon-options.tmpl +++ b/data/templates/dhcp-client/daemon-options.tmpl @@ -1 +1,4 @@ +### Autogenerated by interface.py ### + 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 fe2a67f08..8a44a9761 100644 --- a/data/templates/dhcp-client/ipv4.tmpl +++ b/data/templates/dhcp-client/ipv4.tmpl @@ -1,4 +1,5 @@ -# generated by dhcp.py +### Autogenerated by interface.py ### + option rfc3442-classless-static-routes code 121 = array of unsigned integer 8; timeout 60; retry 300; @@ -15,3 +16,4 @@ interface "{{ ifname }}" { 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 112431c5f..5c0cea280 100644 --- a/data/templates/dhcp-client/ipv6.tmpl +++ b/data/templates/dhcp-client/ipv6.tmpl @@ -1,6 +1,6 @@ -# generated by dhcp.py -# man https://www.unix.com/man-page/debian/5/dhcp6c.conf/ +### Autogenerated by interface.py ### +# man https://www.unix.com/man-page/debian/5/dhcp6c.conf/ interface {{ ifname }} { request domain-name-servers; request domain-name; @@ -45,3 +45,4 @@ id-assoc pd 2 { }; {% endif %} {% endif %} + |