From 05e84f2a7cf83cc7f32a61f27a9617f7d5ac03a6 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 14 Oct 2020 16:49:10 -0400 Subject: [PATCH] Fix double-console out in genesis With fixed autocons, genesis was double outputting to serial console. Let rungenesis pick the console instead. --- .../genesis/initramfs/opt/confluent/bin/rungenesis | 3 +++ .../initramfs/usr/lib/dracut/hooks/cmdline/10-genesis.sh | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/confluent_osdeploy/genesis/initramfs/opt/confluent/bin/rungenesis b/confluent_osdeploy/genesis/initramfs/opt/confluent/bin/rungenesis index 96d1e283..312ad240 100644 --- a/confluent_osdeploy/genesis/initramfs/opt/confluent/bin/rungenesis +++ b/confluent_osdeploy/genesis/initramfs/opt/confluent/bin/rungenesis @@ -9,8 +9,11 @@ if ! grep console= /proc/cmdline >& /dev/null; then if [ ! -z "$autocons" ]; then echo "Using $(cat /tmp/01-autocons.conf)" tmux a <> $autocons >&0 2>&1 & + else + tmux a <> /dev/console >&0 2>&1 & fi else + tmux a <> /dev/console >&0 2>&1 & tmux a <> /dev/tty1 >&0 2>&1 & fi echo -n "udevd: " diff --git a/confluent_osdeploy/genesis/initramfs/usr/lib/dracut/hooks/cmdline/10-genesis.sh b/confluent_osdeploy/genesis/initramfs/usr/lib/dracut/hooks/cmdline/10-genesis.sh index fa7744c2..b5cfd961 100644 --- a/confluent_osdeploy/genesis/initramfs/usr/lib/dracut/hooks/cmdline/10-genesis.sh +++ b/confluent_osdeploy/genesis/initramfs/usr/lib/dracut/hooks/cmdline/10-genesis.sh @@ -10,4 +10,7 @@ mkdir -p /var/empty/sshd sed -i '/^root:x/d' /etc/passwd echo root:x:0:0::/:/bin/bash >> /etc/passwd echo sshd:x:30:30:SSH User:/var/empty/sshd:/sbin/nologin >> /etc/passwd -tmux new-session sh /opt/confluent/bin/rungenesis +tmux new-session -d sh /opt/confluent/bin/rungenesis +while :; do + sleep 86400 +done