From 5b9fd08dc00f56760ef3939cc4d94dfc2db12bca Mon Sep 17 00:00:00 2001 From: Paul Dersey Date: Mon, 19 Jun 2023 08:49:04 -0400 Subject: [PATCH] Don't use serial console with bare metal option and user provided kernel --- sysa/run2.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sysa/run2.sh b/sysa/run2.sh index 11bdc14..6d21eca 100755 --- a/sysa/run2.sh +++ b/sysa/run2.sh @@ -33,9 +33,15 @@ go_sysb() { mount -t proc proc /proc # kexec time echo "Loading kernel + sysb initramfs using kexec" - kexec -l "/boot/linux-4.9.10" --console-serial \ - --initrd="/boot/initramfs-sysb.cpio.gz" \ - --append="init=/init console=ttyS0" + if [ "${BARE_METAL}" = True ]; then + kexec -l "/boot/linux-4.9.10" \ + --initrd="/boot/initramfs-sysb.cpio.gz" \ + --append="init=/init" + else + kexec -l "/boot/linux-4.9.10" --console-serial \ + --initrd="/boot/initramfs-sysb.cpio.gz" \ + --append="init=/init console=ttyS0" + fi echo "kexecing into sysb" kexec -e fi