From c1aa0b8a405877fb6450b7c3a0792fa1161edacb Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 8 Dec 2018 21:17:19 +0100 Subject: improvments for preseed role --- roles/preseed/templates/preseed_debian-stretch.cfg.j2 | 4 ++++ roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 | 4 ++++ roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/preseed/templates/preseed_debian-stretch.cfg.j2 index 74ab18e8..36d221a1 100644 --- a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 +++ b/roles/preseed/templates/preseed_debian-stretch.cfg.j2 @@ -7,6 +7,8 @@ d-i debian-installer/country string AT d-i debian-installer/locale string en_US.UTF-8 d-i keyboard-configuration/xkb-keymap select us +d-i hw-detect/load_firmware boolean false + d-i netcfg/disable_dhcp boolean true d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }} d-i netcfg/disable_autoconfig boolean false @@ -16,7 +18,9 @@ d-i netcfg/get_gateway string {{ hostvars[hostname].network_cooked.primary.gatew d-i netcfg/get_nameservers string {{ hostvars[hostname].network_cooked.nameservers | join(' ') }} d-i netcfg/confirm_static boolean true +d-i netcfg/hostname string {{ hostname }} d-i netcfg/get_hostname string {{ hostname }} +d-i netcfg/domain string {{ hostvars[hostname].network_cooked.domain }} d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }} d-i netcfg/wireless_wep string diff --git a/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 index d6fbc5d7..8c7093aa 100644 --- a/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 +++ b/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 @@ -11,6 +11,8 @@ d-i console-setup/ask_detect boolean false d-i keyboard-configuration/xkb-keymap select us d-i keyboard-configuration/layoutcode string us +d-i hw-detect/load_firmware boolean false + d-i netcfg/disable_dhcp boolean true d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }} d-i netcfg/disable_autoconfig boolean false @@ -20,7 +22,9 @@ d-i netcfg/get_gateway string {{ hostvars[hostname].network_cooked.primary.gatew d-i netcfg/get_nameservers string {{ hostvars[hostname].network_cooked.nameservers | join(' ') }} d-i netcfg/confirm_static boolean true +d-i netcfg/hostname string {{ hostname }} d-i netcfg/get_hostname string {{ hostname }} +d-i netcfg/domain string {{ hostvars[hostname].network_cooked.domain }} d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }} d-i netcfg/wireless_wep string diff --git a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 index 6f357133..1be16ff8 100644 --- a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 +++ b/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 @@ -11,6 +11,8 @@ d-i console-setup/ask_detect boolean false d-i keyboard-configuration/xkb-keymap select us d-i keyboard-configuration/layoutcode string us +d-i hw-detect/load_firmware boolean false + d-i netcfg/disable_dhcp boolean true d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }} d-i netcfg/disable_autoconfig boolean false @@ -20,7 +22,9 @@ d-i netcfg/get_gateway string {{ hostvars[hostname].network_cooked.primary.gatew d-i netcfg/get_nameservers string {{ hostvars[hostname].network_cooked.nameservers | join(' ') }} d-i netcfg/confirm_static boolean true +d-i netcfg/hostname string {{ hostname }} d-i netcfg/get_hostname string {{ hostname }} +d-i netcfg/domain string {{ hostvars[hostname].network_cooked.domain }} d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }} d-i netcfg/wireless_wep string -- cgit v1.2.3