diff options
Diffstat (limited to 'roles/installer')
11 files changed, 27 insertions, 1 deletions
diff --git a/roles/installer/debian/preseed/defaults/main.yml b/roles/installer/debian/preseed/defaults/main.yml index 7e271783..1a8b5b67 100644 --- a/roles/installer/debian/preseed/defaults/main.yml +++ b/roles/installer/debian/preseed/defaults/main.yml @@ -18,6 +18,7 @@ debian_preseed_no_netplan: no # debian_preseed_kernel_image: debian_preseed_virtual_machine: no debian_preseed_no_splash: yes +debian_preseed_poweroff_when_done: no debian_preseed_manual_partitioning: no diff --git a/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 index 30fa876b..fdc65ff7 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 @@ -70,6 +70,9 @@ d-i pkgsel/upgrade select safe-upgrade popularity-contest popularity-contest/participate boolean false d-i finish-install/reboot_in_progress note +{% if debian_preseed_poweroff_when_done %} +d-i debian-installer/exit/poweroff boolean true +{% endif %} d-i preseed/late_command string \ diff --git a/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 index 1fca669e..575f44a9 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 @@ -70,6 +70,9 @@ d-i pkgsel/upgrade select safe-upgrade popularity-contest popularity-contest/participate boolean false d-i finish-install/reboot_in_progress note +{% if debian_preseed_poweroff_when_done %} +d-i debian-installer/exit/poweroff boolean true +{% endif %} d-i preseed/late_command string \ diff --git a/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 index 43833b4e..3ad35d5a 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 @@ -70,6 +70,9 @@ d-i pkgsel/upgrade select safe-upgrade popularity-contest popularity-contest/participate boolean false d-i finish-install/reboot_in_progress note +{% if debian_preseed_poweroff_when_done %} +d-i debian-installer/exit/poweroff boolean true +{% endif %} d-i preseed/late_command string \ diff --git a/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 index 048c9895..7d6137e4 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 @@ -70,6 +70,9 @@ d-i pkgsel/upgrade select safe-upgrade popularity-contest popularity-contest/participate boolean false d-i finish-install/reboot_in_progress note +{% if debian_preseed_poweroff_when_done %} +d-i debian-installer/exit/poweroff boolean true +{% endif %} d-i preseed/late_command string \ diff --git a/roles/installer/debian/preseed/templates/preseed_kali-kali-rolling.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_kali-kali-rolling.cfg.j2 index 17a1732b..fc9a84a5 100644 --- a/roles/installer/debian/preseed/templates/preseed_kali-kali-rolling.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_kali-kali-rolling.cfg.j2 @@ -67,6 +67,9 @@ d-i pkgsel/upgrade select safe-upgrade popularity-contest popularity-contest/participate boolean false d-i finish-install/reboot_in_progress note +{% if debian_preseed_poweroff_when_done %} +d-i debian-installer/exit/poweroff boolean true +{% endif %} d-i preseed/late_command string \ diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 index dd854161..9d644e4d 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 @@ -85,6 +85,9 @@ popularity-contest popularity-contest/participate boolean false d-i pkgsel/update-policy select none d-i finish-install/reboot_in_progress note +{% if debian_preseed_poweroff_when_done %} +d-i debian-installer/exit/poweroff boolean true +{% endif %} d-i preseed/late_command string \ diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 index 9295766f..48cc16bb 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 @@ -85,6 +85,9 @@ popularity-contest popularity-contest/participate boolean false d-i pkgsel/update-policy select none d-i finish-install/reboot_in_progress note +{% if debian_preseed_poweroff_when_done %} +d-i debian-installer/exit/poweroff boolean true +{% endif %} d-i preseed/late_command string \ diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 index 0d5fe564..8bfbe61a 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 @@ -82,6 +82,9 @@ popularity-contest popularity-contest/participate boolean false d-i pkgsel/update-policy select none d-i finish-install/reboot_in_progress note +{% if debian_preseed_poweroff_when_done %} +d-i debian-installer/exit/poweroff boolean true +{% endif %} d-i preseed/late_command string \ diff --git a/roles/installer/ubuntu/autoinstall/defaults/main.yml b/roles/installer/ubuntu/autoinstall/defaults/main.yml index 109ad855..50a35ae1 100644 --- a/roles/installer/ubuntu/autoinstall/defaults/main.yml +++ b/roles/installer/ubuntu/autoinstall/defaults/main.yml @@ -11,6 +11,7 @@ ubuntu_autoinstall_timezone: Europe/Vienna # ubuntu_autoinstall_kernel_image: ubuntu_autoinstall_virtual_machine: no # ubuntu_autoinstall_desktop: xubuntu +ubuntu_autoinstall_poweroff_when_done: no ubuntu_autoinstall_manual_partitioning: no diff --git a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 index 1dfd44db..3a3e1689 100644 --- a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 +++ b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 @@ -225,7 +225,7 @@ autoinstall: - [ apt-get, -y, -q, auto-remove ] - [ bash, -c, 'dpkg -l | grep "^rc" | awk "{ print(\$2) }" | xargs -r dpkg -P' ] - [ sed, '/^PasswordAuthentication /d', -i, '/etc/ssh/sshd_config' ] -{% if ubuntu_autoinstall_virtual_machine %} +{% if ubuntu_autoinstall_poweroff_when_done %} - [ poweroff ] {% else %} - [ reboot ] |