update bootstrap

51 files changed, 269 insertions, 116 deletions

diff --git a/application-preprocessor/src/main/sh/vespa-preprocess-application b/application-preprocessor/src/main/sh/vespa-preprocess-application
index 0912f3720f4..40742461d81 100644
--- a/application-preprocessor/src/main/sh/vespa-preprocess-application
+++ b/application-preprocessor/src/main/sh/vespa-preprocess-application
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/clustercontroller-standalone/src/main/sh/fleetcontroller-start b/clustercontroller-standalone/src/main/sh/fleetcontroller-start
index 0cf0a9b0f88..85cf698148e 100755
--- a/clustercontroller-standalone/src/main/sh/fleetcontroller-start
+++ b/clustercontroller-standalone/src/main/sh/fleetcontroller-start
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/config-model/src/main/perl/vespa-deploy b/config-model/src/main/perl/vespa-deploy
index e61f3893749..0d22e493c78 100755
--- a/config-model/src/main/perl/vespa-deploy
+++ b/config-model/src/main/perl/vespa-deploy
@@ -55,14 +55,17 @@ sub findhome {
 }
 
 sub findhost {
-    $ENV{'PATH'} = $ENV{'VESPA_HOME'} . '/bin:' . $ENV{'PATH'};
     my $tmp = $ENV{'VESPA_HOSTNAME'};
+    my $bin = $ENV{'VESPA_HOME'} . "/bin";
     if (!defined $tmp) {
-        $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n";
+        $tmp = `${bin}/vespa-detect-hostname || hostname -f || hostname || echo "localhost"`;
         chomp $tmp;
     }
-    system("vespa-validate-hostname $tmp");
-    ( $? == 0 ) or die "Could not validate hostname\n";
+    my $validate = "${bin}/vespa-validate-hostname";
+    if (-f "${validate}") {
+       system("${validate} $tmp");
+       ( $? == 0 ) or die "Could not validate hostname\n";
+    }
     return $tmp;
 }
 
diff --git a/config-model/src/main/sh/vespa-validate-application b/config-model/src/main/sh/vespa-validate-application
index a399fad63be..ba126542289 100755
--- a/config-model/src/main/sh/vespa-validate-application
+++ b/config-model/src/main/sh/vespa-validate-application
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/config-proxy/src/main/sh/vespa-config-ctl.sh b/config-proxy/src/main/sh/vespa-config-ctl.sh
index 6c92bf3c3b2..cc88df0af37 100755
--- a/config-proxy/src/main/sh/vespa-config-ctl.sh
+++ b/config-proxy/src/main/sh/vespa-config-ctl.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/config-proxy/src/main/sh/vespa-config-loadtester.sh b/config-proxy/src/main/sh/vespa-config-loadtester.sh
index 5122d74f59c..47a2b88872c 100644
--- a/config-proxy/src/main/sh/vespa-config-loadtester.sh
+++ b/config-proxy/src/main/sh/vespa-config-loadtester.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/config-proxy/src/main/sh/vespa-config-verification.sh b/config-proxy/src/main/sh/vespa-config-verification.sh
index 584129f686d..58c759c9466 100644
--- a/config-proxy/src/main/sh/vespa-config-verification.sh
+++ b/config-proxy/src/main/sh/vespa-config-verification.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/config/src/apps/vespa-activate-application/vespa-activate-application.sh b/config/src/apps/vespa-activate-application/vespa-activate-application.sh
index 9eb95cc6290..b102f4077b1 100644
--- a/config/src/apps/vespa-activate-application/vespa-activate-application.sh
+++ b/config/src/apps/vespa-activate-application/vespa-activate-application.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/config/src/apps/vespa-config/vespa-config.pl b/config/src/apps/vespa-config/vespa-config.pl
index d651dc2ce39..7f631187b58 100755
--- a/config/src/apps/vespa-config/vespa-config.pl
+++ b/config/src/apps/vespa-config/vespa-config.pl
@@ -55,14 +55,17 @@ sub findhome {
 }
 
 sub findhost {
-    $ENV{'PATH'} = $ENV{'VESPA_HOME'} . '/bin:' . $ENV{'PATH'};
     my $tmp = $ENV{'VESPA_HOSTNAME'};
+    my $bin = $ENV{'VESPA_HOME'} . "/bin";
     if (!defined $tmp) {
-        $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n";
+        $tmp = `${bin}/vespa-detect-hostname || hostname -f || hostname || echo "localhost"`;
         chomp $tmp;
     }
-    system("vespa-validate-hostname $tmp");
-    ( $? == 0 ) or die "Could not validate hostname\n";
+    my $validate = "${bin}/vespa-validate-hostname";
+    if (-f "${validate}") {
+       system("${validate} $tmp");
+       ( $? == 0 ) or die "Could not validate hostname\n";
+    }
     return $tmp;
 }
 
diff --git a/configgen/bin/make-config.pl b/configgen/bin/make-config.pl
index 7b1f1f833ab..13017a679e3 100755
--- a/configgen/bin/make-config.pl
+++ b/configgen/bin/make-config.pl
@@ -62,14 +62,17 @@ sub findhome {
 }
 
 sub findhost {
-    $ENV{'PATH'} = $ENV{'VESPA_HOME'} . '/bin:' . $ENV{'PATH'};
     my $tmp = $ENV{'VESPA_HOSTNAME'};
+    my $bin = $ENV{'VESPA_HOME'} . "/bin";
     if (!defined $tmp) {
-        $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n";
+        $tmp = `${bin}/vespa-detect-hostname || hostname -f || hostname || echo "localhost"`;
         chomp $tmp;
     }
-    system("vespa-validate-hostname $tmp");
-    ( $? == 0 ) or die "Could not validate hostname\n";
+    my $validate = "${bin}/vespa-validate-hostname";
+    if (-f "${validate}") {
+       system("${validate} $tmp");
+       ( $? == 0 ) or die "Could not validate hostname\n";
+    }
     return $tmp;
 }
 
diff --git a/configgen/bin/make-configold.pl b/configgen/bin/make-configold.pl
index bbf7322a059..d299d09d3be 100755
--- a/configgen/bin/make-configold.pl
+++ b/configgen/bin/make-configold.pl
@@ -62,14 +62,17 @@ sub findhome {
 }
 
 sub findhost {
-    $ENV{'PATH'} = $ENV{'VESPA_HOME'} . '/bin:' . $ENV{'PATH'};
     my $tmp = $ENV{'VESPA_HOSTNAME'};
+    my $bin = $ENV{'VESPA_HOME'} . "/bin";
     if (!defined $tmp) {
-        $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n";
+        $tmp = `${bin}/vespa-detect-hostname || hostname -f || hostname || echo "localhost"`;
         chomp $tmp;
     }
-    system("vespa-validate-hostname $tmp");
-    ( $? == 0 ) or die "Could not validate hostname\n";
+    my $validate = "${bin}/vespa-validate-hostname";
+    if (-f "${validate}") {
+       system("${validate} $tmp");
+       ( $? == 0 ) or die "Could not validate hostname\n";
+    }
     return $tmp;
 }
 
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver
index 8c0ea810a9a..3ada0f2fac5 100755
--- a/configserver/src/main/sh/start-configserver
+++ b/configserver/src/main/sh/start-configserver
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/configserver/src/main/sh/start-logd b/configserver/src/main/sh/start-logd
index ce0b60a8d8d..2b6ed01f09c 100644
--- a/configserver/src/main/sh/start-logd
+++ b/configserver/src/main/sh/start-logd
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/configserver/src/main/sh/stop-configserver b/configserver/src/main/sh/stop-configserver
index 957fdb249c3..099429eb556 100755
--- a/configserver/src/main/sh/stop-configserver
+++ b/configserver/src/main/sh/stop-configserver
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/configserver/src/main/sh/vespa-configserver-remove-state b/configserver/src/main/sh/vespa-configserver-remove-state
index e3d348ecefa..faac37d48d4 100755
--- a/configserver/src/main/sh/vespa-configserver-remove-state
+++ b/configserver/src/main/sh/vespa-configserver-remove-state
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/container-search/src/main/sh/invoke b/container-search/src/main/sh/invoke
index 04c145ef035..0e5c281e72b 100755
--- a/container-search/src/main/sh/invoke
+++ b/container-search/src/main/sh/invoke
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/filedistribution/src/main/sh/vespa-status-filedistribution.sh b/filedistribution/src/main/sh/vespa-status-filedistribution.sh
index 2a232abb909..e6ab8d40678 100644
--- a/filedistribution/src/main/sh/vespa-status-filedistribution.sh
+++ b/filedistribution/src/main/sh/vespa-status-filedistribution.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/libmlr/bin/xml2cpp b/libmlr/bin/xml2cpp
index 093ee88b8bc..b92bd8d4a65 100755
--- a/libmlr/bin/xml2cpp
+++ b/libmlr/bin/xml2cpp
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/logserver/bin/logserver-start.sh b/logserver/bin/logserver-start.sh
index 0b26d3cbb1c..d72a3f10119 100755
--- a/logserver/bin/logserver-start.sh
+++ b/logserver/bin/logserver-start.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/node-admin/src/main/sh/node-admin.sh b/node-admin/src/main/sh/node-admin.sh
index 3cff2a636c2..10e7e3c5ef6 100755
--- a/node-admin/src/main/sh/node-admin.sh
+++ b/node-admin/src/main/sh/node-admin.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/searchcore/src/apps/vespa-remove-indexes/vespa-remove-index.sh b/searchcore/src/apps/vespa-remove-indexes/vespa-remove-index.sh
index 4d3fbb23d95..0ed35588e22 100755
--- a/searchcore/src/apps/vespa-remove-indexes/vespa-remove-index.sh
+++ b/searchcore/src/apps/vespa-remove-indexes/vespa-remove-index.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/searchlib/src/main/sh/vespa-gbdt-converter b/searchlib/src/main/sh/vespa-gbdt-converter
index 7b7b2b67482..19a53408ab5 100755
--- a/searchlib/src/main/sh/vespa-gbdt-converter
+++ b/searchlib/src/main/sh/vespa-gbdt-converter
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/searchlib/src/main/sh/vespa-treenet-converter b/searchlib/src/main/sh/vespa-treenet-converter
index 2d892f89829..03fabf8f5f4 100755
--- a/searchlib/src/main/sh/vespa-treenet-converter
+++ b/searchlib/src/main/sh/vespa-treenet-converter
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/standalone-container/src/main/sh/jdisc_container_start b/standalone-container/src/main/sh/jdisc_container_start
index a41913326d7..5b4202c9ddc 100755
--- a/standalone-container/src/main/sh/jdisc_container_start
+++ b/standalone-container/src/main/sh/jdisc_container_start
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh
index 8af36a98ab4..dc1f5c7b71e 100755
--- a/standalone-container/src/main/sh/standalone-container.sh
+++ b/standalone-container/src/main/sh/standalone-container.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespa_feed_perf/src/main/sh/vespa-feed-perf b/vespa_feed_perf/src/main/sh/vespa-feed-perf
index b91e025bef9..25340de25ec 100755
--- a/vespa_feed_perf/src/main/sh/vespa-feed-perf
+++ b/vespa_feed_perf/src/main/sh/vespa-feed-perf
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh
index 4763494669c..8061c497454 100755
--- a/vespabase/src/rhel-prestart.sh
+++ b/vespabase/src/rhel-prestart.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespabase/src/start-cbinaries.sh b/vespabase/src/start-cbinaries.sh
index 08197304378..f81c2d9ada3 100755
--- a/vespabase/src/start-cbinaries.sh
+++ b/vespabase/src/start-cbinaries.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespabase/src/start-tool.sh b/vespabase/src/start-tool.sh
index 7c7b26db768..f3100739cde 100755
--- a/vespabase/src/start-tool.sh
+++ b/vespabase/src/start-tool.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespabase/src/start-vespa-base.sh b/vespabase/src/start-vespa-base.sh
index 48518291c83..a346854134d 100755
--- a/vespabase/src/start-vespa-base.sh
+++ b/vespabase/src/start-vespa-base.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespabase/src/stop-vespa-base.sh b/vespabase/src/stop-vespa-base.sh
index e25c251dd75..4e14b51c869 100755
--- a/vespabase/src/stop-vespa-base.sh
+++ b/vespabase/src/stop-vespa-base.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespabase/src/vespa-start-configserver.sh b/vespabase/src/vespa-start-configserver.sh
index 7d717c4b1dc..3a7416c5162 100755
--- a/vespabase/src/vespa-start-configserver.sh
+++ b/vespabase/src/vespa-start-configserver.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespabase/src/vespa-start-services.sh b/vespabase/src/vespa-start-services.sh
index 90a9667e402..ef8a6b55f05 100755
--- a/vespabase/src/vespa-start-services.sh
+++ b/vespabase/src/vespa-start-services.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespabase/src/vespa-stop-configserver.sh b/vespabase/src/vespa-stop-configserver.sh
index 88eefd38f3b..a0c3ca7169b 100755
--- a/vespabase/src/vespa-stop-configserver.sh
+++ b/vespabase/src/vespa-stop-configserver.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespabase/src/vespa-stop-services.sh b/vespabase/src/vespa-stop-services.sh
index 2ca245b2c93..0f1fcd30abe 100755
--- a/vespabase/src/vespa-stop-services.sh
+++ b/vespabase/src/vespa-stop-services.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespaclient-java/src/main/sh/vespa-destination.sh b/vespaclient-java/src/main/sh/vespa-destination.sh
index 00171806b69..3b11b151727 100755
--- a/vespaclient-java/src/main/sh/vespa-destination.sh
+++ b/vespaclient-java/src/main/sh/vespa-destination.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespaclient-java/src/main/sh/vespa-document-statistics.sh b/vespaclient-java/src/main/sh/vespa-document-statistics.sh
index 16b7e1f1b37..ee72574fbc7 100755
--- a/vespaclient-java/src/main/sh/vespa-document-statistics.sh
+++ b/vespaclient-java/src/main/sh/vespa-document-statistics.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespaclient-java/src/main/sh/vespa-feeder.sh b/vespaclient-java/src/main/sh/vespa-feeder.sh
index ff45587b9fc..3c1dfaed60d 100755
--- a/vespaclient-java/src/main/sh/vespa-feeder.sh
+++ b/vespaclient-java/src/main/sh/vespa-feeder.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespaclient-java/src/main/sh/vespa-get.sh b/vespaclient-java/src/main/sh/vespa-get.sh
index d6a9108fedd..aef730923de 100644
--- a/vespaclient-java/src/main/sh/vespa-get.sh
+++ b/vespaclient-java/src/main/sh/vespa-get.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespaclient-java/src/main/sh/vespa-query-profile-dump-tool.sh b/vespaclient-java/src/main/sh/vespa-query-profile-dump-tool.sh
index 031034f9371..281ce97009a 100755
--- a/vespaclient-java/src/main/sh/vespa-query-profile-dump-tool.sh
+++ b/vespaclient-java/src/main/sh/vespa-query-profile-dump-tool.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespaclient-java/src/main/sh/vespa-stat.sh b/vespaclient-java/src/main/sh/vespa-stat.sh
index 08d87685b67..d8c33d979d0 100644
--- a/vespaclient-java/src/main/sh/vespa-stat.sh
+++ b/vespaclient-java/src/main/sh/vespa-stat.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh b/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh
index 555fdc464c6..675b8548d81 100755
--- a/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh
+++ b/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespaclient-java/src/main/sh/vespa-visit-target.sh b/vespaclient-java/src/main/sh/vespa-visit-target.sh
index 72d4aac120b..8e57a70b970 100755
--- a/vespaclient-java/src/main/sh/vespa-visit-target.sh
+++ b/vespaclient-java/src/main/sh/vespa-visit-target.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespaclient-java/src/main/sh/vespa-visit.sh b/vespaclient-java/src/main/sh/vespa-visit.sh
index b84a906f41e..5fa9e9451d6 100755
--- a/vespaclient-java/src/main/sh/vespa-visit.sh
+++ b/vespaclient-java/src/main/sh/vespa-visit.sh
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/vespaclient/src/perl/bin/GetClusterState.pl b/vespaclient/src/perl/bin/GetClusterState.pl
index 155db87f34e..aee988c74ff 100755
--- a/vespaclient/src/perl/bin/GetClusterState.pl
+++ b/vespaclient/src/perl/bin/GetClusterState.pl
@@ -53,14 +53,17 @@ sub findhome {
 }
 
 sub findhost {
-    $ENV{'PATH'} = $ENV{'VESPA_HOME'} . '/bin:' . $ENV{'PATH'};
     my $tmp = $ENV{'VESPA_HOSTNAME'};
+    my $bin = $ENV{'VESPA_HOME'} . "/bin";
     if (!defined $tmp) {
-        $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n";
+        $tmp = `${bin}/vespa-detect-hostname || hostname -f || hostname || echo "localhost"`;
         chomp $tmp;
     }
-    system("vespa-validate-hostname $tmp");
-    ( $? == 0 ) or die "Could not validate hostname\n";
+    my $validate = "${bin}/vespa-validate-hostname";
+    if (-f "${validate}") {
+       system("${validate} $tmp");
+       ( $? == 0 ) or die "Could not validate hostname\n";
+    }
     return $tmp;
 }
 
diff --git a/vespaclient/src/perl/bin/GetNodeState.pl b/vespaclient/src/perl/bin/GetNodeState.pl
index 1e048df4b40..c303b94be90 100755
--- a/vespaclient/src/perl/bin/GetNodeState.pl
+++ b/vespaclient/src/perl/bin/GetNodeState.pl
@@ -53,14 +53,17 @@ sub findhome {
 }
 
 sub findhost {
-    $ENV{'PATH'} = $ENV{'VESPA_HOME'} . '/bin:' . $ENV{'PATH'};
     my $tmp = $ENV{'VESPA_HOSTNAME'};
+    my $bin = $ENV{'VESPA_HOME'} . "/bin";
     if (!defined $tmp) {
-        $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n";
+        $tmp = `${bin}/vespa-detect-hostname || hostname -f || hostname || echo "localhost"`;
         chomp $tmp;
     }
-    system("vespa-validate-hostname $tmp");
-    ( $? == 0 ) or die "Could not validate hostname\n";
+    my $validate = "${bin}/vespa-validate-hostname";
+    if (-f "${validate}") {
+       system("${validate} $tmp");
+       ( $? == 0 ) or die "Could not validate hostname\n";
+    }
     return $tmp;
 }
 
diff --git a/vespaclient/src/perl/bin/SetNodeState.pl b/vespaclient/src/perl/bin/SetNodeState.pl
index 77ebf9a2456..b1fc32c02b3 100755
--- a/vespaclient/src/perl/bin/SetNodeState.pl
+++ b/vespaclient/src/perl/bin/SetNodeState.pl
@@ -53,14 +53,17 @@ sub findhome {
 }
 
 sub findhost {
-    $ENV{'PATH'} = $ENV{'VESPA_HOME'} . '/bin:' . $ENV{'PATH'};
     my $tmp = $ENV{'VESPA_HOSTNAME'};
+    my $bin = $ENV{'VESPA_HOME'} . "/bin";
     if (!defined $tmp) {
-        $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n";
+        $tmp = `${bin}/vespa-detect-hostname || hostname -f || hostname || echo "localhost"`;
         chomp $tmp;
     }
-    system("vespa-validate-hostname $tmp");
-    ( $? == 0 ) or die "Could not validate hostname\n";
+    my $validate = "${bin}/vespa-validate-hostname";
+    if (-f "${validate}") {
+       system("${validate} $tmp");
+       ( $? == 0 ) or die "Could not validate hostname\n";
+    }
     return $tmp;
 }
 
diff --git a/zkfacade/src/main/sh/zkcat b/zkfacade/src/main/sh/zkcat
index b9de9364836..675aeabbcfb 100755
--- a/zkfacade/src/main/sh/zkcat
+++ b/zkfacade/src/main/sh/zkcat
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/zkfacade/src/main/sh/zkcli b/zkfacade/src/main/sh/zkcli
index 67866274709..cbc356ae9e1 100755
--- a/zkfacade/src/main/sh/zkcli
+++ b/zkfacade/src/main/sh/zkcli
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/zkfacade/src/main/sh/zkctl b/zkfacade/src/main/sh/zkctl
index fe0a257baa0..721becf8c79 100755
--- a/zkfacade/src/main/sh/zkctl
+++ b/zkfacade/src/main/sh/zkctl
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }
 
diff --git a/zkfacade/src/main/sh/zkls b/zkfacade/src/main/sh/zkls
index a7c95eee224..c75f63efbde 100755
--- a/zkfacade/src/main/sh/zkls
+++ b/zkfacade/src/main/sh/zkls
@@ -56,9 +56,12 @@ findroot () {
 
 findhost () {
     if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+    fi
+    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+    if [ -f "$validate" ]; then
+        "$validate" "${VESPA_HOSTNAME}" || exit 1
     fi
-    vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
     export VESPA_HOSTNAME
 }