From a7539c111ecf7832f2667f68319bacfdd5a826f2 Mon Sep 17 00:00:00 2001 From: William Wernert Date: Sat, 18 Apr 2020 18:34:04 -0400 Subject: [PATCH] [refactor] Remove duplicate code in set_hostname --- setup/so-functions | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index a999367bc..b95033eb7 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1244,30 +1244,25 @@ set_environment_var() { set_hostname() { - echo 'set_hostname called' >> "$SETUPLOG" 2>&1 - echo $TESTHOST >> "$SETUPLOG" 2>&1 - echo $INSTALLTYPE >> "$SETUPLOG" 2>&1 - hostnamectl set-hostname --static $HOSTNAME - echo "127.0.0.1 $HOSTNAME $HOSTNAME.localdomain localhost localhost.localdomain localhost4 localhost4.localdomain" > /etc/hosts - echo "::1 localhost localhost.localdomain localhost6 localhost6.localdomain6" >> /etc/hosts - echo $HOSTNAME > /etc/hostname - HOSTNAME=$(cat /etc/hostname) - if [[ ! $INSTALLTYPE =~ ^(MASTER|EVAL|HELIXSENSOR|MASTERSEARCH)$ ]]; then - if [[ $TESTHOST = *"not found"* ]] || [ -z $TESTHOST ] || [[ $TESTHOST = *"connection timed out"* ]]; then - if ! grep -q $MSRVIP /etc/hosts; then - echo "$MSRVIP $MSRV" >> /etc/hosts - fi + set_hostname_iso + + HOSTNAME=$(cat /etc/hostname) + if [[ ! $INSTALLTYPE =~ ^(MASTER|EVAL|HELIXSENSOR|MASTERSEARCH)$ ]]; then + if [[ $TESTHOST = *"not found"* ]] || [ -z "$TESTHOST" ] || [[ $TESTHOST = *"connection timed out"* ]]; then + if ! grep -q "$MSRVIP" /etc/hosts; then + echo "$MSRVIP $MSRV" >> /etc/hosts + fi + fi fi - fi } set_hostname_iso() { - hostnamectl set-hostname --static $HOSTNAME + hostnamectl set-hostname --static "$HOSTNAME" echo "127.0.0.1 $HOSTNAME $HOSTNAME.localdomain localhost localhost.localdomain localhost4 localhost4.localdomain" > /etc/hosts - echo "::1 localhost localhost.localdomain localhost6 localhost6.localdomain6" >> /etc/hosts - echo $HOSTNAME > /etc/hostname + echo "::1 $HOSTNAME $HOSTNAME localhost localhost.localdomain localhost6 localhost6.localdomain6" >> /etc/hosts + echo "$HOSTNAME" > /etc/hostname }