[Linux] Shutdown guest OS after auto install completes instead of reb…

…ooting (#489) Signed-off-by: Qi Zhang <qiz@vmware.com>
vmware · Aug 14, 2023 · e03f031 · e03f031
1 parent fa609ea
commit e03f031
Show file tree

Hide file tree

Showing 27 changed files with 181 additions and 170 deletions.
diff --git a/autoinstall/BCLinux-for-Euler/21.10/ks.cfg b/autoinstall/BCLinux-for-Euler/21.10/ks.cfg
@@ -42,8 +42,8 @@ services --disabled="firewalld"
 # System timezone
 timezone America/New_York --isUtc
 
-# Reboot when the install is finished.
-reboot
+# Shutdown when the install is finished.
+shutdown
 
 %packages
 @^graphical-server-environment

diff --git a/autoinstall/BCLinux/8/ks.cfg b/autoinstall/BCLinux/8/ks.cfg
@@ -41,8 +41,8 @@ services --disabled="firewalld"
 # System timezone
 timezone America/New_York --isUtc
 
-# Reboot when the install is finished.
-reboot
+# Shutdown when the install is finished.
+shutdown
 
 %packages
 @^graphical-server-environment

diff --git a/autoinstall/CentOS/7/ks.cfg b/autoinstall/CentOS/7/ks.cfg
@@ -46,8 +46,8 @@ clearpart --none --initlabel
 services --disabled=firewalld
 eula --agreed
 
-# Reboot when installation finished
-reboot
+# Shutdown when installation finished
+shutdown
 
 %packages
 @^graphical-server-environment

diff --git a/autoinstall/CentOS/7/minimal/ks.cfg b/autoinstall/CentOS/7/minimal/ks.cfg
@@ -43,8 +43,8 @@ clearpart --none --initlabel
 services --disabled=firewalld
 eula --agreed
 
-# Reboot when installation finished
-reboot
+# Shutdown when installation finished
+shutdown
 
 %packages
 @^minimal

diff --git a/autoinstall/Debian/10/preseed.cfg b/autoinstall/Debian/10/preseed.cfg
@@ -195,6 +195,9 @@ d-i grub-installer/bootdev string default
 # Avoid that last message about the install being complete.
 d-i finish-install/reboot_in_progress note
 
+# Shutdown after installation completes
+d-i debian-installer/exit/poweroff boolean true
+
 # This will prevent the installer from ejecting the CD during the reboot,
 # which is useful in some situations.
 #d-i cdrom-detect/eject boolean false

diff --git a/autoinstall/Fedora/36/Server/ks.cfg b/autoinstall/Fedora/36/Server/ks.cfg
@@ -53,8 +53,8 @@ user --name={{ new_user }} --password={{ vm_password_hash }} --groups=root,wheel
 sshkey --username={{ new_user }} "{{ ssh_public_key }}"
 {% endif %}
 
-# Reboot when the install is finished.
-reboot
+# Shutdown when the install is finished.
+shutdown
 
 %post --interpreter=/usr/bin/bash --log=/root/ks-post.log
 if [ -f /etc/cloud/cloud.cfg ]; then

diff --git a/autoinstall/FreeBSD/installerconfig b/autoinstall/FreeBSD/installerconfig
@@ -142,4 +142,6 @@ echo 'autoboot_delay="3"' >> /boot/loader.conf
 
 echo "End of installerconfig" > /dev/ttyu0
 echo "{{ autoinstall_complete_msg }}" > /dev/ttyu0
-shutdown -r now
+
+# Power off system when autoinstall completes
+poweroff
diff --git a/autoinstall/Pardus/preseed.cfg b/autoinstall/Pardus/preseed.cfg
@@ -189,6 +189,9 @@ d-i grub-installer/bootdev string default
 # Avoid that last message about the install being complete.
 d-i finish-install/reboot_in_progress note
 
+# Shutdown after installation completes
+d-i debian-installer/exit/poweroff boolean true
+
 # This will prevent the installer from ejecting the CD during the reboot,
 # which is useful in some situations.
 #d-i cdrom-detect/eject boolean true

diff --git a/autoinstall/RHEL/7/server_with_GUI/ks.cfg b/autoinstall/RHEL/7/server_with_GUI/ks.cfg
@@ -46,8 +46,8 @@ clearpart --none --initlabel
 services --disabled=firewalld
 eula --agreed
 
-# Reboot when the install is finished.
-reboot
+# Shutdown when the install is finished.
+shutdown
 
 
 %packages

diff --git a/autoinstall/RHEL/7/server_without_GUI/ks.cfg b/autoinstall/RHEL/7/server_without_GUI/ks.cfg
@@ -46,8 +46,8 @@ clearpart --none --initlabel
 services --disabled=firewalld
 eula --agreed
 
-# Reboot when the install is finished.
-reboot
+# Shutdown when the install is finished.
+shutdown
 
 %packages
 @^infrastructure-server-environment

diff --git a/autoinstall/RHEL/8/server_with_GUI/ks.cfg b/autoinstall/RHEL/8/server_with_GUI/ks.cfg
@@ -41,8 +41,8 @@ services --disabled="firewalld"
 # System timezone
 timezone America/New_York --isUtc
 
-# Reboot when the install is finished.
-reboot
+# Shutdown when the install is finished.
+shutdown
 
 %packages
 @^graphical-server-environment

diff --git a/autoinstall/RHEL/8/server_without_GUI/ks.cfg b/autoinstall/RHEL/8/server_without_GUI/ks.cfg
@@ -39,8 +39,8 @@ services --enabled="chronyd"
 # System timezone
 timezone America/New_York --isUtc
 
-# Reboot when the install is finished.
-reboot
+# Shutdown when the install is finished.
+shutdown
 %packages
 @^server-product-environment
 kexec-tools

diff --git a/autoinstall/SLE/15/SP3/SLED/autoinst.xml b/autoinstall/SLE/15/SP3/SLED/autoinst.xml
@@ -220,6 +220,7 @@
   <general t="map">
     <mode t="map">
       <confirm t="boolean">false</confirm>
+      <final_halt config:type="boolean">true</final_halt>
     </mode>
   </general>
   <groups t="list">

diff --git a/autoinstall/SLE/15/SP3/SLES/autoinst.xml b/autoinstall/SLE/15/SP3/SLES/autoinst.xml
@@ -184,6 +184,7 @@
     <ask-list t="list"/>
     <mode t="map">
       <confirm t="boolean">false</confirm>
+      <final_halt config:type="boolean">true</final_halt>
     </mode>
     <proposals t="list"/>
     <signature-handling t="map"/>

diff --git a/autoinstall/SLE/15/SP3/SLES_Minimal/autoinst.xml b/autoinstall/SLE/15/SP3/SLES_Minimal/autoinst.xml
@@ -48,6 +48,7 @@
     <ask-list t="list"/>
     <mode t="map">
       <confirm t="boolean">false</confirm>
+      <final_halt config:type="boolean">true</final_halt>
     </mode>
     <proposals t="list"/>
     <signature-handling t="map"/>

diff --git a/autoinstall/SLE/15/SP4/SLED/autoinst.xml b/autoinstall/SLE/15/SP4/SLED/autoinst.xml
@@ -215,6 +215,7 @@
   <general t="map">
     <mode t="map">
       <confirm t="boolean">false</confirm>
+      <final_halt config:type="boolean">true</final_halt>
     </mode>
   </general>
   <groups t="list">

diff --git a/autoinstall/UOS/Server/20/1050a/ks.cfg b/autoinstall/UOS/Server/20/1050a/ks.cfg
@@ -43,8 +43,8 @@ services --enabled="chronyd"
 # System timezone
 timezone America/New_York --utc
 
-# Reboot when the install is finished.
-reboot
+# Shutdown when the install is finished.
+shutdown
 
 %packages
 @Server with DDE

diff --git a/autoinstall/UOS/Server/20/1050e/ks.cfg b/autoinstall/UOS/Server/20/1050e/ks.cfg
@@ -49,8 +49,8 @@ services --enabled="chronyd"
 # System timezone
 timezone America/New_York --isUtc
 
-# Reboot when the install is finished.
-reboot
+# Shutdown when the install is finished.
+shutdown
 
 %anaconda
 pwpolicy root --minlen=6 --minquality=1 --notstrict --nochanges --notempty

diff --git a/autoinstall/Ubuntu/Desktop/Subiquity/user-data.j2 b/autoinstall/Ubuntu/Desktop/Subiquity/user-data.j2
@@ -44,4 +44,4 @@ autoinstall:
     - sed -i 's/^#PermitRootLogin .*/PermitRootLogin yes/' /target/etc/ssh/sshd_config
     - sed -i 's/^#PasswordAuthentication .*/PasswordAuthentication yes/' /target/etc/ssh/sshd_config
     - echo "{{ autoinstall_complete_msg }}" >> /dev/ttyS0
-  shutdown: 'reboot'
+  shutdown: 'poweroff'
diff --git a/autoinstall/Ubuntu/Desktop/Ubiquity/ubuntu.seed b/autoinstall/Ubuntu/Desktop/Ubiquity/ubuntu.seed
@@ -43,7 +43,7 @@ d-i passwd/root-password-crypted password {{ vm_password_md5 }}
 d-i user-setup/allow-password-weak boolean true
 
 d-i pkgsel/language-packs multiselect en, zh
-d-i pkgsel/update-policy select none 
+d-i pkgsel/update-policy select none
 d-i pkgsel/upgrade select none
 
 # By default, the system's locate database will be updated after the
@@ -75,10 +75,10 @@ ubiquity ubiquity/success_command \
     in-target chmod 0644 /root/.ssh/authorized_keys; \
     in-target sed -i 's/#PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config; \
     in-target sed -i 's/#PermitRootLogin.*/PermitRootLogin yes/' /etc/ssh/sshd_config; \
-    echo "{{ autoinstall_complete_msg }}" > /target/dev/ttyS0
+    echo "{{ autoinstall_complete_msg }}" >/dev/ttyS0
 
 d-i finish-install/reboot_in_progress note
 d-i cdrom-detect/eject boolean true
 
 ubiquity ubiquity/summary note
-ubiquity ubiquity/reboot boolean true
+ubiquity ubiquity/poweroff boolean true
diff --git a/autoinstall/Ubuntu/Server/user-data.j2 b/autoinstall/Ubuntu/Server/user-data.j2
@@ -55,3 +55,5 @@ autoinstall:
     - echo 'Acquire::ForceIPv4 "true";' >>/etc/apt/apt.conf.d/99force-ipv4
     - sed -i 's/^#PermitRootLogin .*/PermitRootLogin yes/' /target/etc/ssh/sshd_config
     - sed -i 's/^#PasswordAuthentication .*/PasswordAuthentication yes/' /target/etc/ssh/sshd_config
+    - echo "{{ autoinstall_complete_msg }}" >/dev/ttyS0
+  shutdown: 'poweroff'
diff --git a/autoinstall/openSUSE/15/autoinst.xml b/autoinstall/openSUSE/15/autoinst.xml
@@ -212,6 +212,7 @@
     <general t="map">
         <mode t="map">
             <confirm t="boolean">false</confirm>
+            <final_halt config:type="boolean">true</final_halt>
         </mode>
     </general>
     <groups t="list">
@@ -1416,4 +1417,4 @@
             </script>
         </post-scripts>
     </scripts>
-</profile>
+</profile>
diff --git a/...loy_vm/eject_del_unattend_install_iso.yml → ...deploy_vm/delete_unattend_install_iso.yml b/...loy_vm/eject_del_unattend_install_iso.yml → ...deploy_vm/delete_unattend_install_iso.yml
@@ -1,17 +1,8 @@
-# Copyright 2021-2023 VMware, Inc.
+# Copyright 2023 VMware, Inc.
 # SPDX-License-Identifier: BSD-2-Clause
 ---
-# Eject CDROM of unattend install ISO in guest OS
-- include_tasks: ../utils/eject_cdrom_in_guest.yml
-  vars:
-    guest_cdrom_device_num: "{{ os_install_iso_list_len | int -1 }}"
-  when: guest_os_family != "FreeBSD"
-
-- name: "Eject CD for FreeBSD"
-  ansible.builtin.command: "camcontrol eject /dev/cd0"
-  delegate_to: "{{ vm_guest_ip }}"
-  when: guest_os_family == "FreeBSD"
-
+# Delete unattend install ISO file
+#
 # By default, it's attached to the last CDROM in composed VM CDROMs list
 - name: "Set fact of the controller and unit number of CDROM attaching unattend install ISO"
   ansible.builtin.set_fact: