diff --git a/files/initrd/opt/rr/boot.sh b/files/initrd/opt/rr/boot.sh index a15bb4f1..a0cece1f 100755 --- a/files/initrd/opt/rr/boot.sh +++ b/files/initrd/opt/rr/boot.sh @@ -238,7 +238,7 @@ fi # CMDLINE['modprobe.blacklist']+="sdhci,sdhci_pci,sdhci_acpi" # fi # fi -if [ "${DT}" = "true" ] && ! echo "epyc7002 purley broadwellnkv2" | grep -wq "${PLATFORM}"; then +if [ "${DT}" = "true" ] && ! echo "v1000nk epyc7002 purley broadwellnkv2" | grep -wq "${PLATFORM}"; then if ! echo "${CMDLINE['modprobe.blacklist']}" | grep -q "mpt3sas"; then [ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE['modprobe.blacklist']+="," CMDLINE['modprobe.blacklist']+="mpt3sas" diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh index 443dfe71..9605985e 100755 --- a/files/initrd/opt/rr/menu.sh +++ b/files/initrd/opt/rr/menu.sh @@ -150,8 +150,9 @@ function modelMenu() { while true; do rm -f "${TMP_PATH}/menu" FLGNEX=0 - IGPU1L=(apollolake geminilake epyc7002) - IGPU2L=(epyc7002) + IGPU1L=(apollolake geminilake v1000nk epyc7002) + IGPU2L=(v1000nk epyc7002) + KVER5L=(v1000nk epyc7002) IGPUID="$(lspci -nd ::300 2>/dev/null | grep "8086" | cut -d' ' -f3 | sed 's/://g')" NVMEMS=(DS918+ RS1619xs+ DS419+ DS1019+ DS719+ DS1621xs+) NVMEMD=$(find /sys/devices -type d -name nvme | awk -F'/' '{print NF}' | sort -n | tail -n1) @@ -176,7 +177,7 @@ function modelMenu() { [ -z "${N}" ] && [ ${hasNVME} -ne 0 ] && [ "${DT}" = "DT" ] && N="N" [ -z "${N}" ] && [ ${hasNVME} -eq 2 ] && echo "${NVMEMS[@]}" | grep -wq "${M}" && N="N" [ -z "${H}" ] && [ ${hasHBA} -eq 1 ] && [ ! "${DT}" = "DT" ] && H="H" - [ -z "${H}" ] && [ ${hasHBA} -eq 1 ] && echo "epyc7002" | grep -wq "${A}" && H="H" + [ -z "${H}" ] && [ ${hasHBA} -eq 1 ] && echo "${KVER5L[@]}" | grep -wq "${A}" && H="H" [ ${COMPATIBLE} -eq 1 ] && printf "%s \"\Zb%-14s %-2s %-3s\Zn\" " "${M}" "${A}" "${DT}" "${G}${N}${H}" >>"${TMP_PATH}/menu" done <"${TMP_PATH}/modellist" [ ${FLGNEX} -eq 1 ] && echo "f \"\Z1$(TEXT "Disable flags restriction")\Zn\"" >>"${TMP_PATH}/menu" diff --git a/files/initrd/opt/rr/platforms.yml b/files/initrd/opt/rr/platforms.yml index c5b118a9..84c4dd6c 100644 --- a/files/initrd/opt/rr/platforms.yml +++ b/files/initrd/opt/rr/platforms.yml @@ -107,6 +107,12 @@ platforms: dt: true synoinfo: *synoinfo productvers: *productvers4 + v1000nk: + dt: true + synoinfo: + <<: *synoinfo + netif_seq_by_dts: "no" + productvers: *productvers5 epyc7002: dt: true synoinfo: diff --git a/files/initrd/opt/rr/ramdisk-patch.sh b/files/initrd/opt/rr/ramdisk-patch.sh index 1efd2a5c..d2884af0 100755 --- a/files/initrd/opt/rr/ramdisk-patch.sh +++ b/files/initrd/opt/rr/ramdisk-patch.sh @@ -243,7 +243,9 @@ for N in $(seq 0 7); do done # issues/313 -if [ "${PLATFORM}" = "epyc7002" ]; then +if [ "$(echo "${KVER:-4}" | cut -d'.' -f1)" -lt 5 ]; then + : +else sed -i 's#/dev/console#/var/log/lrc#g' "${RAMDISK_PATH}/usr/bin/busybox" sed -i '/^echo "START/a \\nmknod -m 0666 /dev/console c 1 3' "${RAMDISK_PATH}/linuxrc.syno" fi