3 files changed, 6 insertions, 0 deletions
diff --git a/vespaclient/src/perl/bin/GetClusterState.pl b/vespaclient/src/perl/bin/GetClusterState.pl
index e3528fff039..155db87f34e 100755
--- a/vespaclient/src/perl/bin/GetClusterState.pl
+++ b/vespaclient/src/perl/bin/GetClusterState.pl
@@ -57,9 +57,11 @@ sub findhost {
     my $tmp = $ENV{'VESPA_HOSTNAME'};
     if (!defined $tmp) {
         $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n";
+        chomp $tmp;
     }
     system("vespa-validate-hostname $tmp");
     ( $? == 0 ) or die "Could not validate hostname\n";
+    return $tmp;
 }
 
 BEGIN {
diff --git a/vespaclient/src/perl/bin/GetNodeState.pl b/vespaclient/src/perl/bin/GetNodeState.pl
index 28f3cf99b1f..1e048df4b40 100755
--- a/vespaclient/src/perl/bin/GetNodeState.pl
+++ b/vespaclient/src/perl/bin/GetNodeState.pl
@@ -57,9 +57,11 @@ sub findhost {
     my $tmp = $ENV{'VESPA_HOSTNAME'};
     if (!defined $tmp) {
         $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n";
+        chomp $tmp;
     }
     system("vespa-validate-hostname $tmp");
     ( $? == 0 ) or die "Could not validate hostname\n";
+    return $tmp;
 }
 
 BEGIN {
diff --git a/vespaclient/src/perl/bin/SetNodeState.pl b/vespaclient/src/perl/bin/SetNodeState.pl
index 91ceeea2c1b..77ebf9a2456 100755
--- a/vespaclient/src/perl/bin/SetNodeState.pl
+++ b/vespaclient/src/perl/bin/SetNodeState.pl
@@ -57,9 +57,11 @@ sub findhost {
     my $tmp = $ENV{'VESPA_HOSTNAME'};
     if (!defined $tmp) {
         $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n";
+        chomp $tmp;
     }
     system("vespa-validate-hostname $tmp");
     ( $? == 0 ) or die "Could not validate hostname\n";
+    return $tmp;
 }
 
 BEGIN {