diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2024-05-29 22:34:32 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2024-05-29 22:34:32 +0200 |
| commit | d3f919c8671073672115969c3a5fbdec90ac85d5 (patch) | |
| tree | 3245bc3f85fb7a185821417ae9c4b9936f36b739 | |
| parent | ch-cm4-sensor*: enable SPI-UART controller (diff) | |
revert some debian/preseed and ubuntu/autoinstall changes because they don't really work
| -rw-r--r-- | roles/installer/debian/preseed/templates/preseed_debian-bookworm.cfg.j2 | 8 | ||||
| -rw-r--r-- | roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/roles/installer/debian/preseed/templates/preseed_debian-bookworm.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-bookworm.cfg.j2 index f96231b0..3e86b048 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-bookworm.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-bookworm.cfg.j2 @@ -23,15 +23,15 @@ d-i netcfg/disable_dhcp boolean true d-i netcfg/disable_autoconfig boolean true d-i netcfg/get_ipaddress string {{ network.primary.address | ansible.utils.ipaddr('address') }} d-i netcfg/get_netmask string {{ network.primary.address | ansible.utils.ipaddr('netmask') }} -d-i netcfg/get_gateway string {{ network.primary.gateway | default('') }} -d-i netcfg/get_nameservers string {{ network.nameservers | default([]) | join(' ') }} +d-i netcfg/get_gateway string {{ network.primary.gateway }} +d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }} d-i netcfg/confirm_static boolean true {% endif %} d-i netcfg/hostname string {{ host_name }} d-i netcfg/get_hostname string {{ host_name }} -d-i netcfg/domain string {{ network.domain | default('') }} -d-i netcfg/get_domain string {{ network.domain | default('') }} +d-i netcfg/domain string {{ network.domain }} +d-i netcfg/get_domain string {{ network.domain }} d-i netcfg/wireless_wep string diff --git a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 index 612ba038..fd78bc4d 100644 --- a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 +++ b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 @@ -19,16 +19,12 @@ autoinstall: {% else %} addresses: - {{ network.primary.address }} -{% if 'gateway' in network %} routes: - to: default via: {{ network.primary.gateway }} -{% endif %} {% if (network.nameservers | default([]) | length) > 0 %} nameservers: -{% if 'domain' in network %} search: [ {{ network.domain }} ] -{% endif %} addresses: [ {{ network.nameservers | join(', ') }} ] {% endif %} {% endif %} |