xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-01-12 10:49:17 +00:00
Code Issues Projects Releases Wiki Activity

Fix a couple of problems

Browse Source 
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.
This commit is contained in:
Jarrod Johnson 2020-06-19 10:24:51 -04:00
parent fd82c584d3
commit 785d8a7c1c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
confluent_osdeploy/rhvh4/profiles/default/scripts/pre.sh
View File

@ -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=''

1
confluent_osdeploy/utils/clortho.c
View File

@ -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;