From 27d07fa128ebe4b5d23d37a90a37e6e4beb92923 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 9 Mar 2023 16:57:40 +0100
Subject: finalize rocky9 support

---
 Makefile                   |  4 +++-
 http/rocky-9               |  1 +
 http/rocky/anaconda-ks.cfg |  4 ++--
 rocky-9-x86_64.json        | 14 +++++++-------
 4 files changed, 13 insertions(+), 10 deletions(-)
 create mode 120000 http/rocky-9

diff --git a/Makefile b/Makefile
index b9b628b..b30a5d4 100644
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,8 @@ ifndef ANSIBLE_PROV_EXTRA_ARGS
     ANSIBLE_PROV_EXTRA_ARGS :=
 endif
 
+override ANSIBLE_PROV_EXTRA_ARGS += --scp-extra-args,"-O"
+
 override PACKER_OPTS += -var-file=base.json
 ifdef DEBUG
     VERBOSE := 1
@@ -201,7 +203,7 @@ $(BOOTTARGETS) $(CURBOOTTARGETS):
 	    -var='output_directory=$(BUILD_DIR)/tmp' \
 	    -var='base_image=$(BUILD_DIR)/rootfs-image' \
 	    -var='playbook=$(ANSIBLE_DIR_CORE)/slx-builder.yml' \
-	    -var="extra_ansible_args=-t,install,-t,build" \
+	    -var='extra_ansible_args=-t,install,-t,build' \
 	    -var='extra_ansible_args=$(ANSIBLE_PROV_EXTRA_ARGS)' \
 	    ansible-provisioner.json
 	@mkdir -p $(BUILD_DIR)/boot
diff --git a/http/rocky-9 b/http/rocky-9
new file mode 120000
index 0000000..c8dbb8c
--- /dev/null
+++ b/http/rocky-9
@@ -0,0 +1 @@
+rocky
\ No newline at end of file
diff --git a/http/rocky/anaconda-ks.cfg b/http/rocky/anaconda-ks.cfg
index 6a8b152..8c27730 100644
--- a/http/rocky/anaconda-ks.cfg
+++ b/http/rocky/anaconda-ks.cfg
@@ -32,7 +32,6 @@ curl
 kexec-tools
 openssh
 strace
-tmux
 %end
 
 %pre --interpreter=/usr/bin/perl
@@ -78,6 +77,7 @@ close($fp);
 
 %post --erroronfail
 set -x
+parted -s /dev/sda -- name 2 SLX_SYS
 # rpm --import 'https://www.elrepo.org/RPM-GPG-KEY-elrepo.org'
 # yum -y  install 'http://www.elrepo.org/elrepo-release-7.0-3.el7.elrepo.noarch.rpm'
 # yum-config-manager --enable elrepo-kernel
@@ -89,7 +89,7 @@ set -x
 #
 dnf -y install epel-release
 dnf -y update
-dnf -y install ansible atop git htop iftop jq mutt nmap nmap-ncat systemd-networkd tcpdump vim wget
+dnf -y install atop git htop iftop jq mutt nmap nmap-ncat systemd-networkd tcpdump vim wget
 systemctl enable sshd
 alternatives --set python /usr/bin/python3
 
diff --git a/rocky-9-x86_64.json b/rocky-9-x86_64.json
index 4b4e08d..8ae43b5 100644
--- a/rocky-9-x86_64.json
+++ b/rocky-9-x86_64.json
@@ -28,16 +28,16 @@
 		"shutdown_command":  "{{ user `shutdown_command` }}",
 		"http_directory":    "{{ user `http_dir` }}",
 		"boot_command": [
-      "<tab><bs><bs><bs><bs><bs>inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>"
-#			"<up><tab> ",
-#			"linux inst.cmdline biosdevname=0 net.ifnames=0 ",
-#			"rootpw={{ user `ssh_password` }} ",
-#			"inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `kickstart_path` }}",
-#			"<enter>"
+			"<esc><wait>",
+			"linux inst.cmdline biosdevname=0 net.ifnames=0 ",
+			"rootpw={{ user `ssh_password` }} ",
+			"inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `kickstart_path` }}",
+			"<enter>"
 		],
 		"qemuargs": [
 			["-m", "{{ user `memory` }}"],
-			["-smp", "{{ user `cpus` }}"]
+			["-smp", "{{ user `cpus` }}"],
+			["-cpu", "host"]
 		]
 	}],
 	"post-processors": [{
-- 
cgit v1.2.3-55-g7522