From 1a521a0bb218262d7c69eb837a5bb3d95d37b02d Mon Sep 17 00:00:00 2001
From: Mark Verlinde <mark@havak.nl>
Date: Tue, 29 Jun 2021 18:25:38 +0200
Subject: [PATCH] Minor cleanup - RPI's do not have a bootlaoder known by linux
 distro's - chrony is already enabled @services - remove scipt for wifi fix,
 it is already done @image creation - rootfs-expand needs root privileges

---
 Rocky8_Rpi4.ks | 33 ++-------------------------------
 1 file changed, 2 insertions(+), 31 deletions(-)

diff --git a/Rocky8_Rpi4.ks b/Rocky8_Rpi4.ks
index 65aac5b..f5e2ce4 100644
--- a/Rocky8_Rpi4.ks
+++ b/Rocky8_Rpi4.ks
@@ -4,10 +4,6 @@
 # (pull from pgreco:  https://github.com/psgreco/sig-core-AltArch/tree/master/image_build
 
 
-# Basic setup information
-#%include "Rocky8_Rpi4/020_common.ksi"
-#%include "Rocky8_Rpi4/040_packages.ksi"
-
 # Disk setup
 clearpart --initlabel --all
 part /boot --asprimary --fstype=vfat --size=300 --label=boot
@@ -36,7 +32,7 @@ firewall --enabled --port=22:tcp
 network --bootproto=dhcp --device=link --activate --onboot=on
 services --enabled=sshd,NetworkManager,chronyd
 shutdown
-bootloader --location=mbr --extlinux
+bootloader --location=none
 lang en_US.UTF-8
 
 
@@ -62,10 +58,6 @@ aarch64-img-extra-config
 
 # Post install scripts:
 %post
-# Enabling chronyd on boot
-systemctl enable chronyd
-
-
 # Remove ifcfg-link on pre generated images
 rm -f /etc/sysconfig/network-scripts/ifcfg-link
 
@@ -116,7 +108,7 @@ IMAGE NOTES / DIFFERENCES FROM STOCK ROCKY 8:
 
 
 If you want to automatically resize your / partition, just type the following (as root user):
-rootfs-expand
+sudo rootfs-expand
 
 It should fill your main rootfs partition to the end of the disk.
 
@@ -124,27 +116,6 @@ EOF
 
 chown 1000 /home/rocky/README
 
-
-# Next, script to fix the wifi firmware setting:
-
-cat >/home/rocky/fix-wifi-rpi4.sh << 'EOF'
-#!/bin/bash
-
-# Simple hacky fix to correct wifi settings on the Rpi4 so it loads properly:
-
-sed -i  's/boardflags3=0x48200100/boardflags3=0x44200100/g'  /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
-
-echo "Patched /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt .  You can reboot and wifi should work, or do:    rmmod brcmfmac;  modprobe brcmfmac;  "
-
-EOF
-
-chown 1000 /home/rocky/fix-wifi-rpi4.sh
-chmod 755 /home/rocky/fix-wifi-rpi4.sh
-
-
-# Link the rootfs-expand script:
-ln -s /usr/bin/rootfs-expand  /home/rocky/
-
 # Run this once to fix the wifi:
 sed -i  's/boardflags3=0x48200100/boardflags3=0x44200100/g'  /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt