Merge remote-tracking branch 'origin/github/pr/100'

grml · May 28, 2020 · 91376e3 · 91376e3
2 parents 6aef288 + 4124996
commit 91376e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/etc/zsh/zshenv b/etc/zsh/zshenv
@@ -32,6 +32,8 @@ elif [[ -x $(which hostname) ]] ; then
   export HOSTNAME="$(hostname)"
 elif [[ -x $(which hostnamectl) ]] ; then
   export HOSTNAME="$(hostnamectl --static)"
+else
+  export HOSTNAME="$(uname -n)"
 fi
 
 # make sure /usr/bin/id is available

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
@@ -843,6 +843,8 @@ function grmlcomp () {
       localname=$(hostname)
     elif check_com hostnamectl ; then
       localname=$(hostnamectl --static)
+    else
+      localname="$(uname -n)"
     fi
 
     hosts=(
@@ -2522,6 +2524,8 @@ function grml_maintain_name () {
       localname=$(hostname)
     elif check_com hostnamectl ; then
       localname=$(hostnamectl --static)
+    else
+      localname="$(uname -n)"
     fi
 
     # set hostname if not running on local machine