Skip to content

Commit

Permalink
Merge pull request #1371 from AuxXxilium/dev
Browse files Browse the repository at this point in the history
boot: fix
  • Loading branch information
AuxXxilium committed May 4, 2024
2 parents b409326 + ec01a51 commit 69ba7d1
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions files/initrd/opt/arc/boot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ SN="$(readConfigKey "arc.sn" "${USER_CONFIG_FILE}")"
KERNELPANIC="$(readConfigKey "arc.kernelpanic" "${USER_CONFIG_FILE}")"
DIRECTBOOT="$(readConfigKey "arc.directboot" "${USER_CONFIG_FILE}")"
EMMCBOOT="$(readConfigKey "arc.emmcboot" "${USER_CONFIG_FILE}")"
DT="$(readModelKey "${MODEL}" "dt")"
PLATFORM="$(readModelKey "${MODEL}" "platform")"
PLATFORM=${PLATFORM:-"unknown"}
ETHX="$(ls /sys/class/net/ 2>/dev/null | grep eth)" # real network cards list

declare -A CMDLINE
Expand Down Expand Up @@ -114,7 +117,11 @@ if [ ! "${BUS}" = "usb" ]; then
SIZE=$((${SZ:-0} * ${SS:-0} / 1024 / 1024 + 10))
# Read SATADoM type
SATADOM="$(readConfigKey "satadom" "${USER_CONFIG_FILE}")"
CMDLINE['synoboot_satadom']="${SATADOM:-0}"
if echo "epyc7002" | grep -wq "${PLATFORM}"; then
CMDLINE['synoboot_satadom']="-1"
else
CMDLINE['synoboot_satadom']="${SATADOM:-0}"
fi
CMDLINE['dom_szmax']="${SIZE}"
fi
CMDLINE['panic']="${KERNELPANIC:-0}"
Expand Down Expand Up @@ -147,9 +154,6 @@ if [ -n "$(ls /dev/mmcblk* 2>/dev/null)" ] && [ ! "${BUS}" = "mmc" ] && [ ! "${E
[ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE['modprobe.blacklist']+=","
CMDLINE['modprobe.blacklist']+="sdhci,sdhci_pci,sdhci_acpi"
fi
DT="$(readModelKey "${MODEL}" "dt")"
PLATFORM="$(readModelKey "${MODEL}" "platform")"
PLATFORM=${PLATFORM:-"unknown"}
if [ "${DT}" = "true" ]; then
CMDLINE["vender_format_version"]="2"
CMDLINE["syno_ttyS0"]="serial,0x3f8"
Expand Down

0 comments on commit 69ba7d1

Please sign in to comment.