diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh index ce77bac0..72bc9edd 100755 --- a/files/initrd/opt/arc/arc-functions.sh +++ b/files/initrd/opt/arc/arc-functions.sh @@ -1714,6 +1714,7 @@ function forcessh() { fi ( ONBOOTUP="" + ONBOOTUP="${ONBOOTUP}systemctl restart inetd\n" ONBOOTUP="${ONBOOTUP}synowebapi --exec api=SYNO.Core.Terminal method=set version=3 enable_telnet=true enable_ssh=true ssh_port=22 forbid_console=false\n" ONBOOTUP="${ONBOOTUP}echo \"DELETE FROM task WHERE task_name LIKE ''ARCONBOOTUPARC_SSH'';\" | sqlite3 /usr/syno/etc/esynoscheduler/esynoscheduler.db\n" mkdir -p "${TMP_PATH}/mdX" diff --git a/files/initrd/opt/arc/boot.sh b/files/initrd/opt/arc/boot.sh index ad742bb4..dce45337 100755 --- a/files/initrd/opt/arc/boot.sh +++ b/files/initrd/opt/arc/boot.sh @@ -11,11 +11,10 @@ function bootDSM () { NVPCI_ADDR=$(lspci -nd 10de: | grep -e 0300 -e 0302 | awk '{print $1}') if [ -n "${NVPCI_ADDR}" ]; then modprobe -r nouveau || true - NVDEV_PATH=$(find /sys/devices -name *${NVPCI_ADDR} | grep -v supplier) - for DEV_PATH in ${NVDEV_PATH} - do + NVDEV_PATH=$(find /sys/devices -name *${NVPCI_ADDR} | grep -v supplier) + for DEV_PATH in ${NVDEV_PATH}; do if [ -e ${DEV_PATH}/reset ]; then - echo 1 > ${DEV_PATH}/reset || true + echo 1 > ${DEV_PATH}/reset || true fi done fi @@ -161,10 +160,8 @@ function bootDSM () { CMDLINE['modprobe.blacklist']+="mpt3sas" fi fi - if true; then - [ "${CMDLINE['modprobe.blacklist']}" != "" ] && CMDLINE['modprobe.blacklist']+="," - CMDLINE['modprobe.blacklist']+="evbug" - fi + CMDLINE['kvm.ignore_msrs']="1" + CMDLINE['kvm.report_ignored_msrs']="0" if echo "apollolake geminilake" | grep -wq "${PLATFORM}"; then CMDLINE["intel_iommu"]="igfx_off" fi diff --git a/files/p1/boot/grub/grub.cfg b/files/p1/boot/grub/grub.cfg index 428fd50c..8aac8223 100644 --- a/files/p1/boot/grub/grub.cfg +++ b/files/p1/boot/grub/grub.cfg @@ -78,7 +78,7 @@ set menu_color_normal=white/black set menu_color_highlight=white/red set color_normal=white/black -set ARC_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait pcie_aspm=off net.ifnames=0 ipv6.disable=1 nox2apic nomodeset" +set ARC_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait pcie_aspm=off net.ifnames=0 ipv6.disable=1 nox2apic nomodeset iommu=off" search --set=root --label "ARC3" if [ -e /automated ]; then