From 3eaa4159994b53607a10e9017cc6b6583aef8022 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Wed, 21 Aug 2024 17:15:34 +0300
Subject: [PATCH] Update kickstart

---
 http/msvsphere-8-gencloud.x86_64.ks | 40 +++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/http/msvsphere-8-gencloud.x86_64.ks b/http/msvsphere-8-gencloud.x86_64.ks
index dda53e4..3e784b4 100644
--- a/http/msvsphere-8-gencloud.x86_64.ks
+++ b/http/msvsphere-8-gencloud.x86_64.ks
@@ -1,4 +1,4 @@
-# AlmaLinux 8 kickstart file for Generic Cloud (OpenStack) image
+# MSVSphere OS 8 Packer template for building Generic Cloud (OpenStack compatible) images.
 
 url --url https://rsync.inferitos.ru/msvsphere/8/BaseOS/x86_64/kickstart/
 repo --name=BaseOS --baseurl=https://rsync.inferitos.ru/msvsphere/8/BaseOS/x86_64/os/
@@ -14,16 +14,26 @@ keyboard us
 timezone UTC --isUtc
 
 network --bootproto=dhcp
-firewall --enabled --service=ssh
+firewall --disabled
 services --disabled="kdump" --enabled="chronyd,rsyslog,sshd"
 selinux --enforcing
 
-# TODO: remove "console=tty0" from here
-bootloader --append="console=ttyS0,115200n8 console=tty0 crashkernel=auto net.ifnames=0 no_timer_check" --location=mbr --timeout=1
-zerombr
-clearpart --all --initlabel
-reqpart
-part / --fstype="xfs" --size=8000
+bootloader --timeout=1 --location=mbr --append="console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0"
+
+%pre --erroronfail
+
+parted -s -a optimal /dev/sda -- mklabel gpt
+parted -s -a optimal /dev/sda -- mkpart biosboot 1MiB 2MiB set 1 bios_grub on
+parted -s -a optimal /dev/sda -- mkpart '"EFI System Partition"' fat32 2MiB 202MiB set 2 esp on
+parted -s -a optimal /dev/sda -- mkpart boot xfs 202MiB 1226MiB
+parted -s -a optimal /dev/sda -- mkpart root xfs 1226MiB 100%
+
+%end
+
+part biosboot --fstype=biosboot --onpart=sda1
+part /boot/efi --fstype=efi --onpart=sda2
+part /boot --fstype=xfs --onpart=sda3
+part / --fstype=xfs --onpart=sda4
 
 rootpw --plaintext msvsphere
 
@@ -31,6 +41,7 @@ reboot --eject
 
 %packages
 @core
+grub2-pc
 -biosdevname
 -open-vm-tools
 -plymouth
@@ -43,11 +54,20 @@ sphere-release-server
 sphere-release
 %end
 
-
 # disable kdump service
 %addon com_redhat_kdump --disable
 %end
 
+%post --erroronfail
+
+EX_NOINPUT=66
+
+root_disk=$(grub2-probe --target=disk /boot/grub2)
+
+if [[ "$root_disk" =~ ^"/dev/" ]]; then
+    grub2-install --target=i386-pc "$root_disk"
+else
+    exit "$EX_NOINPUT"
+fi
 
-%post
 %end