X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=autoconfig.functions;h=89616dc1e8149822c5fb3c9896b548faee3d0f59;hb=fc58987650e3c8f6397a85b4400a6b526f64d141;hp=8eba8601ae74eeab59a9fb7c19398a50277b66e1;hpb=00cfb15b47dfb930e16335750f9171cb1bd8739f;p=grml-autoconfig.git

diff --git a/autoconfig.functions b/autoconfig.functions
index 8eba860..89616dc 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -372,20 +372,21 @@ config_language(){
 
 # {{{ Set hostname
 config_hostname(){
- if checkbootparam 'hostname' ; then
+  if ! checkbootparam 'hostname' ; then
+    return 0
+  fi
+
   HOSTNAME="$(getbootparam 'hostname' 2>>$DEBUG)"
   if [ -z "$HOSTNAME" ] && [ -x /usr/bin/random-hostname ] ; then
-     einfo "Generating random hostname as no hostname was specified."
-     HOSTNAME="$(/usr/bin/random-hostname)"
-     eend $?
+    einfo "Generating random hostname as no hostname was specified."
+    HOSTNAME="$(/usr/bin/random-hostname)"
+    eend $?
   fi
+
   einfo "Setting hostname to $HOSTNAME as requested."
-  grml-hostname $HOSTNAME >>$DEBUG ; RC=$?
-  [ "$RC" = "0" ] && hostname $HOSTNAME
+  grml-hostname $HOSTNAME >>$DEBUG ; eend $RC
   eend $RC
- else
-  hostname --file /etc/hostname
- fi
+fi
 }
 # }}}
 
@@ -2197,4 +2198,4 @@ fi
 # }}}
 
 ## END OF FILE #################################################################
-# vim:foldmethod=marker expandtab ai ft=zsh shiftwidth=3
+# vim:foldmethod=marker expandtab ai ft=zsh shiftwidth=2