From 785d8a7c1cb5a63339de86fffd1c800f361df51d Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 19 Jun 2020 10:24:51 -0400 Subject: [PATCH] Fix a couple of problems In RHV, tmux was unable to attach because of TMUX variable. Unset it to allow tmux to work normally. Clortho didn't specify family, which worked in linux but not in ESXi. --- confluent_osdeploy/rhvh4/profiles/default/scripts/pre.sh | 2 +- confluent_osdeploy/utils/clortho.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/confluent_osdeploy/rhvh4/profiles/default/scripts/pre.sh b/confluent_osdeploy/rhvh4/profiles/default/scripts/pre.sh index bd97b19a..0393e124 100644 --- a/confluent_osdeploy/rhvh4/profiles/default/scripts/pre.sh +++ b/confluent_osdeploy/rhvh4/profiles/default/scripts/pre.sh @@ -39,7 +39,7 @@ done /usr/sbin/sshd -f /etc/ssh/sshd_config.anaconda if [ -f "/run/install/cmdline.d/01-autocons.conf" ]; then consoledev=$(cat /run/install/cmdline.d/01-autocons.conf | sed -e 's!console=!/dev/!' -e 's/,.*//') - tmux a <> $consoledev >&0 2>&1 & + TMUX= tmux a <> $consoledev >&0 2>&1 & fi cryptboot=$(grep ^encryptboot: /etc/confluent.deploycfg | awk '{print $2}') LUKSPARTY='' diff --git a/confluent_osdeploy/utils/clortho.c b/confluent_osdeploy/utils/clortho.c index fcbdbf26..94918189 100644 --- a/confluent_osdeploy/utils/clortho.c +++ b/confluent_osdeploy/utils/clortho.c @@ -54,6 +54,7 @@ int main(int argc, char* argv[]) { memset(&timeout, 0, sizeof(struct timeval)); timeout.tv_sec = 10; net4bind.sin_port = htons(302); + net4bind.sin_family = AF_INET; net6bind.sin6_port = htons(302); net6bind.sin6_family = AF_INET6; hints.ai_socktype = SOCK_STREAM;