X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=7fff972e5cf37bdfc923d6a0ea4f50166b62a1ec;hp=b75f648b40327d03f2d829790b922df0cbcea1af;hb=9c5f2ccd4226bca0e1066a7fd14e34314b3d43c7;hpb=f193f810048be63d821312157e5ede23910f30b4

diff --git a/autoconfig.functions b/autoconfig.functions
index b75f648..7fff972 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -356,6 +356,11 @@ config_language(){
 config_hostname(){
  if checkbootparam 'hostname' ; then
   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 $?
+  fi
   einfo "Setting hostname to $HOSTNAME as requested."
   grml-hostname $HOSTNAME >>$DEBUG ; RC=$?
   [ "$RC" = "0" ] && hostname $HOSTNAME
@@ -574,11 +579,11 @@ fi
 
 # activate serial console {{{
 config_console(){
-local line
-local ws
-ws='	 '
-
 if checkbootparam 'console'; then
+  local line
+  local ws
+  ws='	 '
+
   einfo "Bootoption for serial console detected:"
 
   line="$CMDLINE x "
@@ -589,12 +594,12 @@ if checkbootparam 'console'; then
     case "$this" in
       console=*)
         local serial="$this"
-	local device="${this%%,*}"
-	local device="${device##*=}"
+        local device="${this%%,*}"
+        local device="${device##*=}"
         if ! echo $serial | grep -q ttyS ; then
-          ewarn "Warning: console=ttyS... not specified as last console= option. Falling back to defaults."
+          ewarn "Warning: console=ttyS... not specified as last console= option. Falling back to set up ttyS0/9600."
+          sed -i "/^#grmlserial#/iT0:23:respawn:/bin/bash -c \"/sbin/getty -L /dev/ttyS0 -l /usr/bin/zsh-login 9600 vt100 || sleep 30\"" /etc/inittab
           eend 0
-          local speed="9600"
         else
           local option="${serial##*,}"
           # default (works for kvm & CO):
@@ -612,18 +617,18 @@ if checkbootparam 'console'; then
           esac
         fi
         eindent
-          einfo "Activting console login on device ${device} with speed ${speed}."
-	  local number="${device#ttyS}"
-	  local inittab=../inittab
-          sed -i "/#grmlserial#/iT$number:23:respawn:/bin/bash -c \"/sbin/getty -L $device -l /usr/bin/zsh-login $speed vt100 || sleep 30\"" $inittab ;  eend $?
-	  telinitq="1"
+          einfo "Activating console login on device ${device} with speed ${speed}."
+          local number="${device#ttyS}"
+          sed -i "/^#grmlserial#/iT$number:23:respawn:/bin/bash -c \"/sbin/getty -L $device -l /usr/bin/zsh-login $speed vt100 || sleep 30\"" /etc/inittab
+          eend $?
+          telinitq="1"
         eoutdent
         ;;
     esac
     this="${line%%[$ws]*}"
     line="${line#*[$ws]}"
-  done 
-  
+  done
+
   if [ -n "$telinitq" ]; then
     /sbin/telinit q
   fi
@@ -2026,6 +2031,7 @@ fi
 # {{{ /cdrom/.*-options
 config_debs(){
 if checkbootparam 'debs' ; then
+   iszsh && setopt localoptions shwordsplit
    DEBS="$(getbootparam 'debs' 2>>$DEBUG)"
    if ! echo $DEBS | grep -q '/'; then
      # backwards compatibility: if no path is given get debs from debs/
@@ -2423,7 +2429,7 @@ config_lvm(){
 # {{{ debnet: setup network based on an existing one found on a partition
 config_debnet(){
 if checkbootparam 'debnet' ; then
- iszsh && setopt shwordsplit
+ iszsh && setopt localoptions shwordsplit
  DEVICES="$(< /proc/partitions tail -n +3 | awk '{print "/dev/"$4}' | tr "\n" " ")"
  DEVICES="$DEVICES $(ls /dev/mapper/*)"
  FOUND_DEBNET=""