From 8f494646ba1ad18c427f383e70d5fa9716597a99 Mon Sep 17 00:00:00 2001
From: Neil Hanlon <neil@rockylinux.org>
Date: Thu, 1 Feb 2024 16:29:47 +0100
Subject: [PATCH] fix: aarch does not have xen drivers

---
 Rocky-9-EC2-Base.ks     | 8 ++++++--
 Rocky-9-EC2-LVM.ks      | 8 ++++++--
 cloud/rocky-ec2-base.ks | 8 ++++++--
 cloud/rocky-ec2-lvm.ks  | 8 ++++++--
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/Rocky-9-EC2-Base.ks b/Rocky-9-EC2-Base.ks
index 11c2260..5c73879 100644
--- a/Rocky-9-EC2-Base.ks
+++ b/Rocky-9-EC2-Base.ks
@@ -188,7 +188,7 @@ truncate -c -s 0 /var/log/dnf.log
 echo 'ec2' > /etc/yum/vars/infra
 
 rm -rf /var/log/yum.log
-rm -rf /var/lib/yum/*
+rm -rf "/var/lib/yum/*"
 rm -rf /root/install.log
 rm -rf /root/install.log.syslog
 rm -rf /root/anaconda-ks.cfg
@@ -209,7 +209,11 @@ EOL
 # enable resizing on copied AMIs
 echo 'install_items+=" sgdisk "' > /etc/dracut.conf.d/sgdisk.conf
 
-echo 'add_drivers+=" xen-netfront xen-blkfront "' > /etc/dracut.conf.d/xen.conf
+# Only x86 has xen support at this time
+if [[ "$(arch)" == "x86_64" ]]; then
+  echo 'add_drivers+=" xen-netfront xen-blkfront "' > /etc/dracut.conf.d/xen.conf
+fi
+
 # Rerun dracut for the installed kernel (not the running kernel):
 KERNEL_VERSION=$(rpm -q kernel --qf '%{V}-%{R}.%{arch}\n')
 dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
diff --git a/Rocky-9-EC2-LVM.ks b/Rocky-9-EC2-LVM.ks
index 7475be6..edfae9a 100644
--- a/Rocky-9-EC2-LVM.ks
+++ b/Rocky-9-EC2-LVM.ks
@@ -190,7 +190,7 @@ truncate -c -s 0 /var/log/dnf.log
 echo 'ec2' > /etc/yum/vars/infra
 
 rm -rf /var/log/yum.log
-rm -rf /var/lib/yum/*
+rm -rf "/var/lib/yum/*"
 rm -rf /root/install.log
 rm -rf /root/install.log.syslog
 rm -rf /root/anaconda-ks.cfg
@@ -211,7 +211,11 @@ EOL
 # enable resizing on copied AMIs
 echo 'install_items+=" sgdisk "' > /etc/dracut.conf.d/sgdisk.conf
 
-echo 'add_drivers+=" xen-netfront xen-blkfront "' > /etc/dracut.conf.d/xen.conf
+# Only x86 has xen support at this time
+if [[ "$(arch)" == "x86_64" ]]; then
+  echo 'add_drivers+=" xen-netfront xen-blkfront "' > /etc/dracut.conf.d/xen.conf
+fi
+
 # Rerun dracut for the installed kernel (not the running kernel):
 KERNEL_VERSION=$(rpm -q kernel --qf '%{V}-%{R}.%{arch}\n')
 dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
diff --git a/cloud/rocky-ec2-base.ks b/cloud/rocky-ec2-base.ks
index e9ff7f2..ef84f93 100644
--- a/cloud/rocky-ec2-base.ks
+++ b/cloud/rocky-ec2-base.ks
@@ -96,7 +96,7 @@ truncate -c -s 0 /var/log/dnf.log
 echo 'ec2' > /etc/yum/vars/infra
 
 rm -rf /var/log/yum.log
-rm -rf /var/lib/yum/*
+rm -rf "/var/lib/yum/*"
 rm -rf /root/install.log
 rm -rf /root/install.log.syslog
 rm -rf /root/anaconda-ks.cfg
@@ -117,7 +117,11 @@ EOL
 # enable resizing on copied AMIs
 echo 'install_items+=" sgdisk "' > /etc/dracut.conf.d/sgdisk.conf
 
-echo 'add_drivers+=" xen-netfront xen-blkfront "' > /etc/dracut.conf.d/xen.conf
+# Only x86 has xen support at this time
+if [[ "$(arch)" == "x86_64" ]]; then
+  echo 'add_drivers+=" xen-netfront xen-blkfront "' > /etc/dracut.conf.d/xen.conf
+fi
+
 # Rerun dracut for the installed kernel (not the running kernel):
 KERNEL_VERSION=$(rpm -q kernel --qf '%{V}-%{R}.%{arch}\n')
 dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
diff --git a/cloud/rocky-ec2-lvm.ks b/cloud/rocky-ec2-lvm.ks
index 7702c56..4c25aab 100644
--- a/cloud/rocky-ec2-lvm.ks
+++ b/cloud/rocky-ec2-lvm.ks
@@ -96,7 +96,7 @@ truncate -c -s 0 /var/log/dnf.log
 echo 'ec2' > /etc/yum/vars/infra
 
 rm -rf /var/log/yum.log
-rm -rf /var/lib/yum/*
+rm -rf "/var/lib/yum/*"
 rm -rf /root/install.log
 rm -rf /root/install.log.syslog
 rm -rf /root/anaconda-ks.cfg
@@ -117,7 +117,11 @@ EOL
 # enable resizing on copied AMIs
 echo 'install_items+=" sgdisk "' > /etc/dracut.conf.d/sgdisk.conf
 
-echo 'add_drivers+=" xen-netfront xen-blkfront "' > /etc/dracut.conf.d/xen.conf
+# Only x86 has xen support at this time
+if [[ "$(arch)" == "x86_64" ]]; then
+  echo 'add_drivers+=" xen-netfront xen-blkfront "' > /etc/dracut.conf.d/xen.conf
+fi
+
 # Rerun dracut for the installed kernel (not the running kernel):
 KERNEL_VERSION=$(rpm -q kernel --qf '%{V}-%{R}.%{arch}\n')
 dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION