Skip to content

Commit 8bf29c7

Browse files
committed
fix(debian-ip): include all mapped options as valid options
As reported in #58210 and #57820, not all options get rendered in the final `interfaces` file. The valid_opts list must be a superset of the keys of the optmap map for the mappted options to get rendered. This commit adds the missing options to the valid_opts list.
1 parent 1717176 commit 8bf29c7

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

‎salt/templates/debian_ip/debian_eth.jinja‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212
} -%}
1313
{% set concat_opts = ['dns_nameservers'] -%}
1414
{% set valid_opts = [
15-
'autoconf', 'privext', 'dhcp', 'hwaddress', 'vlan_raw_device', 'address', 'addresses', 'netmask',
15+
'autoconf', 'privext', 'dhcp', 'hwaddress', 'hwaddr', 'vlan_raw_device', 'address', 'addresses', 'netmask',
1616
'metric', 'gateway', 'pointopoint', 'scope', 'hostname', 'media', 'leasehours', 'leasetime',
1717
'vendor', 'client', 'bootfile', 'server', 'mode', 'endpoint', 'dstaddr', 'local', 'ttl', 'mtu',
1818
'provider', 'unit', 'options', 'master', 'dns_nameservers', 'wireless_mode', 'wpa_ap_scan',
1919
'wpa_conf', 'wpa_driver', 'wpa_group', 'wpa_key_mgmt', 'wpa_pairwise', 'wpa_proto', 'wpa_psk',
20-
'wpa_roam', 'wpa_ssid', 'accept_ra'
20+
'wpa_roam', 'wpa_ssid', 'accept_ra', 'up_cmds', 'down_cmds', 'pre_up_cmds', 'post_up_cmds',
21+
'pre_down_cmds', 'post_down_cmds'
2122
] -%}
2223
{% if data.enabled %}auto {{ name }}
2324
{% endif %}{% if data.hotplug %}allow-hotplug {{ name }}

0 commit comments

Comments
 (0)