From b5a6781742b2751e116cdb5bc583f32e12835856 Mon Sep 17 00:00:00 2001
From: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
Date: Thu, 14 Jan 2021 11:16:23 +0800
Subject: [PATCH] standardize partition with gpt

---
 packer/libvirt-33/ks.cfg    |  4 ++--
 packer/virtualbox-33/ks.cfg | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/packer/libvirt-33/ks.cfg b/packer/libvirt-33/ks.cfg
index 1e08d40..541fc29 100644
--- a/packer/libvirt-33/ks.cfg
+++ b/packer/libvirt-33/ks.cfg
@@ -16,9 +16,9 @@ bootloader --timeout=1 --append="net.ifnames=0 biosdevname=0"
 zerombr
 clearpart --all --initlabel --disklabel=gpt
 part biosboot --size=1 --fstype=biosboot
-part /boot --size=512 --fstype=ext4 
+part /boot --size=512 --fstype=ext4
 part swap --size=4096 --fstype=swap
-part / --grow --fstype=ext4 
+part / --grow --fstype=ext4
 
 services --enabled=sshd --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
 
diff --git a/packer/virtualbox-33/ks.cfg b/packer/virtualbox-33/ks.cfg
index 288aa8e..541fc29 100644
--- a/packer/virtualbox-33/ks.cfg
+++ b/packer/virtualbox-33/ks.cfg
@@ -6,16 +6,20 @@ keyboard us
 timezone --utc Etc/UTC
 rootpw --plaintext vagrant
 user --name=vagrant --password=vagrant --plaintext
-zerombr
-clearpart --all --initlabel
-autopart --type=plain --fstype=ext4 --nohome
 selinux --permissive
 firewall --disabled
 authconfig --enableshadow --passalgo=sha512
 network --device eth0 --bootproto dhcp --hostname=fedora.localdomain
-bootloader --timeout=1 --append="net.ifnames=0 biosdevname=0"
 url --url=https://dl.fedoraproject.org/pub/fedora/linux/releases/33/Server/x86_64/os/
 
+bootloader --timeout=1 --append="net.ifnames=0 biosdevname=0"
+zerombr
+clearpart --all --initlabel --disklabel=gpt
+part biosboot --size=1 --fstype=biosboot
+part /boot --size=512 --fstype=ext4
+part swap --size=4096 --fstype=swap
+part / --grow --fstype=ext4
+
 services --enabled=sshd --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
 
 %packages
@@ -51,6 +55,7 @@ sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnam
 sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub
 grub2-mkconfig -o /boot/grub2/grub
 dracut -f
+mkdir -p /etc/ssh/sshd_config.d
 echo "PubkeyAcceptedKeyTypes=+ssh-rsa" > /etc/ssh/sshd_config.d/10-vagrant-insecure-rsa-key.conf
 chcon system_u:object_r:etc_t:s0 /etc/ssh/sshd_config.d/10-vagrant-insecure-rsa-key.conf
 chmod 600 /etc/ssh/sshd_config.d/10-vagrant-insecure-rsa-key.conf