diff --git a/files/board/arpl/overlayfs/opt/arpl/boot.sh b/files/board/arpl/overlayfs/opt/arpl/boot.sh index 5c2e4cbb..0ba545e5 100755 --- a/files/board/arpl/overlayfs/opt/arpl/boot.sh +++ b/files/board/arpl/overlayfs/opt/arpl/boot.sh @@ -102,6 +102,7 @@ fi # Prepare command line CMDLINE_LINE="" +CMDLINE_DIRECT="" grep -q "force_junior" /proc/cmdline && CMDLINE_LINE+="force_junior " [ ${EFI} -eq 1 ] && CMDLINE_LINE+="withefi " [ "${BUS}" = "ata" ] && CMDLINE_LINE+="synoboot_satadom=${DOM} dom_szmax=${SIZE} " @@ -109,11 +110,14 @@ CMDLINE_LINE+="console=ttyS0,115200n8 earlyprintk log_buf_len=32M earlycon=uart8 for KEY in ${!CMDLINE[@]}; do VALUE="${CMDLINE[${KEY}]}" CMDLINE_LINE+=" ${KEY}" + CMDLINE_DIRECT+=" ${KEY}" [ -n "${VALUE}" ] && CMDLINE_LINE+="=${VALUE}" + [ -n "${VALUE}" ] && CMDLINE_DIRECT+="=${VALUE}" done # Escape special chars CMDLINE_LINE=`echo ${CMDLINE_LINE} | sed 's/>/\\\\>/g'` -grub-editenv ${GRUB_PATH}/grubenv set dsm_cmdline="${CMDLINE_LINE}" +CMDLINE_DIRECT=`echo ${CMDLINE_DIRECT} | sed 's/>/\\\\>/g'` +grub-editenv ${GRUB_PATH}/grubenv set dsm_cmdline="${CMDLINE_DIRECT}" echo -e "Cmdline:\n\033[1;36m${CMDLINE_LINE}\033[0m" # Wait for an IP diff --git a/files/board/arpl/p1/grub/grub.cfg b/files/board/arpl/p1/grub/grub.cfg index b83a0b2d..28f8384e 100644 --- a/files/board/arpl/p1/grub/grub.cfg +++ b/files/board/arpl/p1/grub/grub.cfg @@ -51,7 +51,7 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then set timeout="1" menuentry 'Boot DSM kernel directly' --id direct { echo "Loading DSM kernel..." - linux /zImage-dsm ${dsm_cmdline} + linux /zImage-dsm console=ttyS0,115200n8 earlyprintk log_buf_len=32M earlycon=uart8250,io,0x3f8,115200n8 elevator=elevator root=/dev/md0 loglevel=15 ${dsm_cmdline} echo "Loading DSM initramfs..." initrd /initrd-dsm echo "Booting..."