From 3506a8e38350f9f3befec27763b36d9ed48f3d4a Mon Sep 17 00:00:00 2001 From: Steev Klimaszewski Date: Sat, 24 Sep 2022 03:21:37 -0500 Subject: [PATCH] radxa-zero: Add console=both to kernel cmdline --- common.d/radxa_zero.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common.d/radxa_zero.sh b/common.d/radxa_zero.sh index 3f64b60..fdfa7cf 100644 --- a/common.d/radxa_zero.sh +++ b/common.d/radxa_zero.sh @@ -113,7 +113,7 @@ mount "${bootp}" "${base_dir}"/root/boot status "Edit the extlinux.conf file to set root uuid and proper name" # Ensure we don't have root=/dev/sda3 in the extlinux.conf which comes from running u-boot-menu in a cross chroot # We do this down here because we don't know the UUID until after the image is created -sed -i -e "0,/append.*/s//append root=UUID=$(blkid -s UUID -o value ${rootp}) rootfstype=$fstype earlyprintk console=ttyAML0,115200 console=tty1 swiotlb=1 coherent_pool=1m ro rootwait/g" ${work_dir}/boot/extlinux/extlinux.conf +sed -i -e "0,/append.*/s//append root=UUID=$(blkid -s UUID -o value ${rootp}) rootfstype=$fstype earlyprintk console=ttyAML0,115200 console=tty1 console=both swiotlb=1 coherent_pool=1m ro rootwait/g" ${work_dir}/boot/extlinux/extlinux.conf # And we remove the "GNU/Linux because we don't use it sed -i -e "s|.*GNU/Linux Rolling|menu label Kali Linux|g" ${work_dir}/boot/extlinux/extlinux.conf @@ -127,7 +127,7 @@ sed -i -e "s/LABEL=BOOT/UUID=$(blkid -s UUID -o value ${bootp})/" ${work_dir}/et status "Set the default options in /etc/default/u-boot" echo 'U_BOOT_MENU_LABEL="Kali Linux"' >>${work_dir}/etc/default/u-boot -echo 'U_BOOT_PARAMETERS="earlyprintk console=ttyAML0,115200 console=tty1 swiotlb=1 coherent_pool=1m ro rootwait"' >>${work_dir}/etc/default/u-boot +echo 'U_BOOT_PARAMETERS="earlyprintk console=ttyAML0,115200 console=tty1 console=both swiotlb=1 coherent_pool=1m ro rootwait"' >>${work_dir}/etc/default/u-boot status "Rsyncing rootfs into image file" rsync -HPavz -q --exclude boot "${work_dir}"/ "${base_dir}"/root/