From afabf12c4f87f9ef9493e3abe3b8e7ebc233c9b5 Mon Sep 17 00:00:00 2001
From: AuxXxilium <info@auxxxilium.tech>
Date: Sat, 18 May 2024 19:19:24 +0200
Subject: [PATCH] tree: some fixes around

Signed-off-by: AuxXxilium <info@auxxxilium.tech>
---
 files/initrd/opt/arc/arc.sh               | 2 +-
 files/initrd/opt/arc/boot.sh              | 8 ++++----
 files/initrd/opt/arc/include/functions.sh | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh
index 4b92776e..ca1a7fa6 100755
--- a/files/initrd/opt/arc/arc.sh
+++ b/files/initrd/opt/arc/arc.sh
@@ -181,7 +181,7 @@ function arcModel() {
         if [ "${DT}" = "true" ] && [ "${EXTERNALCONTROLLER}" = "true" ] && [ ! "${A}" = "epyc7002" ]; then
           COMPATIBLE=0
         fi
-        if [ ${SATACONTROLLER} -eq 0 ] && [ "${EXTERNALCONTROLLER}" = "false" ] && [ ! "${A}" = "epyc7002" ]; then
+        if [ "${SATACONTROLLER}" = "0" ] && [ "${EXTERNALCONTROLLER}" = "false" ] && [ ! "${A}" = "epyc7002" ]; then
           COMPATIBLE=0
         fi
         [ -z "$(grep -w "${M}" "${S_FILE}")" ] && COMPATIBLE=0
diff --git a/files/initrd/opt/arc/boot.sh b/files/initrd/opt/arc/boot.sh
index bfd23d3b..15c1abd3 100755
--- a/files/initrd/opt/arc/boot.sh
+++ b/files/initrd/opt/arc/boot.sh
@@ -136,10 +136,10 @@ CMDLINE['loglevel']="15"
 CMDLINE['log_buf_len']="32M"
 CMDLINE["HddHotplug"]="1"
 CMDLINE["vender_format_version"]="2"
-if [ -n "$(ls /dev/mmcblk* 2>/dev/null)" ] && [ ! "${BUS}" = "mmc" ] && [ ! "${EMMCBOOT}" = "true" ]; then
-  [ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE['modprobe.blacklist']+=","
-  CMDLINE['modprobe.blacklist']+="sdhci,sdhci_pci,sdhci_acpi"
-fi
+#if [ -n "$(ls /dev/mmcblk* 2>/dev/null)" ] && [ ! "${BUS}" = "mmc" ] && [ ! "${EMMCBOOT}" = "true" ]; then
+#  [ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE['modprobe.blacklist']+=","
+#  CMDLINE['modprobe.blacklist']+="sdhci,sdhci_pci,sdhci_acpi"
+#fi
 if [ "${DT}" = "true" ] && ! echo "epyc7002 purley broadwellnkv2" | grep -wq "${PLATFORM}"; then
   [ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE['modprobe.blacklist']+=","
   CMDLINE['modprobe.blacklist']+="mpt3sas"
diff --git a/files/initrd/opt/arc/include/functions.sh b/files/initrd/opt/arc/include/functions.sh
index 5ab668a7..01918de5 100755
--- a/files/initrd/opt/arc/include/functions.sh
+++ b/files/initrd/opt/arc/include/functions.sh
@@ -82,7 +82,7 @@ function generateSerial() {
     SERIAL+="$(random)"
     ;;
   alpha)
-    SERIAL+="$(genRandomLetter)$(genRandomValue)$(genRandomValue)$(genRandomValue)$(genRandomValue)$(genRandomLetter)"
+    SERIAL+="$(genRandomLetter)$(genRandomValue)$(genRandomValue)$(genRandomValue)$(genRandomValue)$(genRandomValue)"
     ;;
   esac