From 5822f4e40047b86f209433d3469da322d7c55932 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Sat, 4 May 2024 01:46:41 -0700
Subject: [PATCH] adjust priority and scr

---
 config.sh                   | 6 ++++--
 repositories/gnulab-tmp.xml | 2 +-
 sbc/pi.xml                  | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/config.sh b/config.sh
index 4a5ae56..bd56e35 100644
--- a/config.sh
+++ b/config.sh
@@ -722,8 +722,10 @@ function genericarm_sbc_steps() {
   mkdir -p /boot/efi/EFI/BOOT
   if [ -d /boot/efi/EFI/rocky/ ] && [ -f /boot/efi/EFI/rocky/grubaa64.efi ];then
     for j in grub.cfg grubenv;do
-      mv -f /boot/grub2/${j} /boot/efi/EFI/rocky/
-      ln -s ../efi/EFI/rocky/${j} /boot/grub2/${j}
+      if [ -f "/boot/grub2/${j}" ]; then
+        mv -f /boot/grub2/${j} /boot/efi/EFI/rocky/
+        ln -s ../efi/EFI/rocky/${j} /boot/grub2/${j}
+      fi
     done
     cp -f /boot/efi/EFI/rocky/grubaa64.efi /boot/efi/EFI/BOOT/BOOTAA64.EFI
   fi
diff --git a/repositories/gnulab-tmp.xml b/repositories/gnulab-tmp.xml
index 8d08113..396829a 100644
--- a/repositories/gnulab-tmp.xml
+++ b/repositories/gnulab-tmp.xml
@@ -1,6 +1,6 @@
 <!-- There isn't a way to exclude packages from a certain repo -->
 <image>
-  <repository type="rpm-md" alias="gnulab_tmp" priority="4">
+  <repository type="rpm-md" alias="gnulab_tmp" priority="10">
     <source path="https://rockyrepos.gnulab.org/gen_aarch64_el$releasever/"/>
   </repository>
 </image>
diff --git a/sbc/pi.xml b/sbc/pi.xml
index 0549cf9..bd0e32a 100644
--- a/sbc/pi.xml
+++ b/sbc/pi.xml
@@ -32,7 +32,7 @@
     <type image="oem"
       filesystem="ext4"
       bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="500" firmware="efi"
-      kernelcmdline="root=LABEL=rootfs rootfstype=ext4 elevator=deadline rootwait"
+      kernelcmdline="root=LABEL=rootfs rootfstype=ext4 elevator=deadline rootwait console=ttyS0"
       devicepersistency="by-label"
       editbootinstall="sbc/editbootinstall_genericarm.sh"
       rootfs_label="rootfs">