From 42d9d6be5f6387d82a7bb6f05b17a2b0806b232e Mon Sep 17 00:00:00 2001
From: AuxXxilium <info@auxxxilium.tech>
Date: Mon, 1 Jul 2024 17:47:37 +0200
Subject: [PATCH] boot: reactivate sdcard in dsm

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

diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh
index 6bb041b4..7eac86be 100755
--- a/files/initrd/opt/arc/arc-functions.sh
+++ b/files/initrd/opt/arc/arc-functions.sh
@@ -290,7 +290,7 @@ function cmdlineMenu() {
   while true; do
     dialog --backtitle "$(backtitle)" --cancel-label "Exit" --menu "Choose an Option" 0 0 0 \
       --file "${TMP_PATH}/menu" 2>"${TMP_PATH}/resp"
-    [ $? -ne 0 ] && return 1
+    [ $? -ne 0 ] && break
     case "$(cat ${TMP_PATH}/resp)" in
       1)
         MSG=""
@@ -687,7 +687,7 @@ function backupMenu() {
       2 "Restore Encryption Key from DSM" \
       3 "Backup Encryption Key to DSM" \
       2>"${TMP_PATH}/resp"
-    [ $? -ne 0 ] && return 1
+    [ $? -ne 0 ] && break
     case "$(cat ${TMP_PATH}/resp)" in
       1)
         DSMROOTS="$(findDSMRoot)"
@@ -823,7 +823,7 @@ function updateMenu() {
       6 "Update Patches" \
       7 "Automated Update Mode" \
       2>"${TMP_PATH}/resp"
-    [ $? -ne 0 ] && return 1
+    [ $? -ne 0 ] && break
     case "$(cat ${TMP_PATH}/resp)" in
       1)
         dialog --backtitle "$(backtitle)" --title "Upgrade Loader" --aspect 18 \
@@ -1931,7 +1931,7 @@ function satadomMenu() {
 # Decrypt Menu
 function decryptMenu() {
   if [ -f "${S_FILE_ENC}" ]; then
-    CONFIGSVERSION=$(cat "${MODEL_CONFIG_PATH}/VERSION")
+    CONFIGSVERSION="$(cat "${MODEL_CONFIG_PATH}/VERSION")"
     cp -f "${S_FILE}" "${S_FILE}.bak"
     dialog --backtitle "$(backtitle)" --colors --title "Arc Decrypt" \
       --inputbox "Enter Decryption Key for ${CONFIGSVERSION}" 7 40 2>"${TMP_PATH}/resp"
diff --git a/files/initrd/opt/arc/boot.sh b/files/initrd/opt/arc/boot.sh
index d54c94a4..b6c1fcf9 100755
--- a/files/initrd/opt/arc/boot.sh
+++ b/files/initrd/opt/arc/boot.sh
@@ -127,10 +127,10 @@ function bootDSM () {
   CMDLINE["vender_format_version"]="2"
   [ $(cat /proc/cpuinfo | grep Intel | wc -l) -gt 0 ] && CMDLINE["intel_pstate"]="disable"
 
-  #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"