remove console statements

fouwels-org · Jul 20, 2021 · 8d4c60d · 8d4c60d
1 parent 80cbb81
commit 8d4c60d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -136,8 +136,8 @@ RUN cd init && go build -ldflags "-s -w" -o /rootfs/init && strip /rootfs/init
 
 # Copy in primary config, and default secondary config to rootfs
 ARG CONFIG_PRIMARY=CONFIG_PRIMARY_UNSET
-COPY /config/primary/$CONFIG_PRIMARY /rootfs/config/primary.yml
-COPY /config/secondary/default.yml /rootfs/config/secondary.yml
+COPY config/primary/$CONFIG_PRIMARY /rootfs/config/primary.yml
+COPY config/secondary/default.yml /rootfs/config/secondary.yml
 RUN find /rootfs > ${OUT_DIR}/rootfs.txt
 
 # Build initramfs

diff --git a/config/config-5.10.1-rt20 b/config/config-5.10.1-rt20
@@ -3834,7 +3834,7 @@ CONFIG_COMMON_CLK=y
 CONFIG_COMMON_CLK_SI544=m
 CONFIG_CODA_FS=m
 CONFIG_CNIC=m
-CONFIG_CMDLINE="isolcpus=3 irqaffinity=0,1,2 rcu-nocbs=3 idle=poll console=tty0 console=ttyS0,9600n8"
+CONFIG_CMDLINE="isolcpus=3 irqaffinity=0,1,2 rcu-nocbs=3 idle=poll"
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CLZ_TAB=y
 CONFIG_CLS_U32_PERF=y

diff --git a/deploy/qemu/qemu.sh b/deploy/qemu/qemu.sh
@@ -79,7 +79,7 @@ EOF
     QEMU_DISPLAY="-display vnc=:0"
 
     if [ "$COMMAND" = "kernel" ]; then
-        QEMU_DISK="-kernel $EFI -nographic"
+        QEMU_DISK="-kernel $EFI --append console=ttyS0 -nographic"
     fi
     if [ "$COMMAND" = "disk" ]; then
         QEMU_DISK="-serial mon:stdio -boot menu=on\