X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=7714ef26ab06874dab2dfdd824ff597d5f4d2ac7;hp=ba0fe2ca059dc7e05662f6cc641067160a0372a3;hb=571636c61251f288d4d0fc22ec650298e344740f;hpb=efd6786e49003dac27e4ff9f038a1e134ce43cca

diff --git a/autoconfig.functions b/autoconfig.functions
index ba0fe2c..7714ef2 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Don Okt 12 13:00:04 CEST 2006 [mika]
+# Latest change: Mon Nov 27 21:02:23 CET 2006 [mika]
 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh
@@ -89,6 +89,7 @@ mount_sys(){
 # }}}
 
 # {{{ Read in boot parameters
+[ -f /proc/version ] || mount_proc # make sure we can access /proc/cmdline when sourcing this file too
 CMDLINE="$(cat /proc/cmdline)"
 [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/* | tr '\n' ' ')"
 # }}}
@@ -196,7 +197,7 @@ config_language(){
 
  # set default to 'en' in live-cd mode if $LANGUAGE is not yet set:
  if [ -z "$INSTALLED" ] ; then
-    [ -n "$LANGUAGE" ] || LANGUAGE='en'
+    [ -n "$LANGUAGE" ] || LANGUAGE='en-utf8'
  fi
 
  # if bootoption lang is used update /etc/default/locale, otherwise *not*!
@@ -208,10 +209,11 @@ config_language(){
  if [ -z "$CONSOLEFONT" ] ; then
     if ! checkbootparam "nodefaultfont" >>$DEBUG 2>&1 ; then
        # [ -n "$UTF8" ] && CONSOLEFONT='LatArCyrHeb-16' || CONSOLEFONT='Lat15-Terminus16'
-       if [ -r /usr/share/consolefonts/Lat15-Terminus16.psf.gz ] ; then
-          CONSOLEFONT='Lat15-Terminus16'
+       # if [ -r /usr/share/consolefonts/Lat15-Terminus16.psf.gz ] ; then
+       if [ -r /usr/share/consolefonts/Uni3-Terminus14.psf.gz ] ; then
+          CONSOLEFONT='Uni3-Terminus14'
        else
-          ewarn "/usr/share/consolefonts/Lat15-Terminus16.psf.gz not available. Please upgrade package console-terminus." ; eend 1
+          ewarn "/usr/share/consolefonts/Uni3-Terminus14.psf.gz not available. Please upgrade package console-terminus." ; eend 1
        fi
     fi
  fi
@@ -279,9 +281,9 @@ config_language(){
      consolechars -f $CONSOLEFONT || consolechars -d
      eend $?
 
-     if [ -n "$UTF8" ] ; then
-        einfo "Notice: run 'filterm - dynafont' in your shell to enable a unicode capable console."
-     fi
+#     if [ -n "$UTF8" ] ; then
+#        einfo "Notice: run 'filterm - dynafont' in your shell to enable a unicode capable console."
+#     fi
   fi
 
   # we have to set up all consoles, therefore loop it over all ttys:
@@ -315,7 +317,13 @@ config_hostname(){
 
 # fstabuser (needed when running from harddisk with username != grml {{{
 config_userfstab(){
-  fstabuser=$(getent passwd 1000 | cut -d: -f1)
+  [ -r /etc/grml/autoconfig ] && . /etc/grml/autoconfig
+  if [ -n "$CONFIG_FSTAB_USER" ] ; then
+     fstabuser="$CONFIG_FSTAB_USER"
+  else
+     fstabuser=$(getent passwd 1000 | cut -d: -f1)
+  fi
+  # if not yet set fall back to default 'grml' user
   [ -n "$fstabuser" ] || fstabuser='grml'
 }
 # }}}
@@ -328,8 +336,20 @@ config_time(){
   checkbootparam utc >>$DEBUG 2>&1 && UTC="-u"
   checkbootparam gmt >>$DEBUG 2>&1 && UTC="-u"
   # hwclock uses the TZ variable
-  export TZ
-  hwclock $UTC -s
+  if [ -r /etc/default/locale ] ; then
+     . /etc/default/locale
+  else
+     TZ=Europe/Vienna
+  fi
+  ERROR=$(TZ="$TZ" hwclock $UTC -s 2>&1) ; RC=$?
+  if [ -n "$ERROR" ] ; then
+     eindent
+     ERROR=$(TZ="$TZ" hwclock $UTC -s --directisa 2>&1)
+     if [ -n "$ERROR" ] ; then
+        eerror "Problem running hwclock: $ERROR" ; eend 1
+     fi
+     eoutdent
+  fi
  fi
 }
 # }}}
@@ -358,24 +378,6 @@ fi
 }
 # }}}
 
-# {{{ installed on hd?
-config_checkfs(){
-if [ -n "$INSTALLED" ]; then
-  einfo "Running from HD, checking filesystems."
-# We are running from HD, so a file system check is recommended
-  [ -f /etc/init.d/checkroot.sh ] && /etc/init.d/checkroot.sh
-  [ -f /etc/init.d/checkfs.sh ]   && /etc/init.d/checkfs.sh
-  eend 0
-fi
-}
-# }}}
-
-# {{{ / must be read-write in any case, starting from here
-config_remount_root(){
-  mount -o remount,rw / 2>>$DEBUG
-}
-# }}}
-
 # {{{ ld.so.cache + depmod
 config_ld_mod(){
 if [ -n "$INSTALLED" ]; then
@@ -632,7 +634,7 @@ fi
 }
 # }}}
 
-# {{{ blacklist specific module
+# {{{ blacklist specific module [ used in /etc/init.d/udev ]
 config_blacklist(){
 if checkbootparam "blacklist" ; then
  if [ -z "$INSTALLED" ]; then
@@ -915,7 +917,7 @@ check_partitions 1>/dev/null 2>&1 # avoid output "check_partitions:3: read-only
 # }}}
 
 # {{{ Enable DMA for all IDE drives now if not disabled
-# Notice: Already done by linuxrc, maybe not on hd-installations
+# Notice: Already done by linuxrc, but make sure it's done also on harddisk-installed systems
 config_dma(){
 if checkbootparam "nodma"; then
   ewarn "Skipping DMA accelleration as requested on boot commandline." ; eend 0
@@ -937,9 +939,13 @@ fi
 
 # {{{ Start creating /etc/fstab with HD partitions and USB SCSI devices now
 config_fstab(){
-NOSWAP=""
-checkbootparam "noswap" && NOSWAP="yes"
-if checkbootparam "nofstab"; then
+
+NOSWAP="yes" # we do not use swap by default!
+if checkbootparam "swap" -o checkbootparam "anyswap" ; then
+   NOSWAP=''
+fi
+
+if checkbootparam "nofstab" -o checkbootparam "forensic" ; then
   ewarn "Skipping /etc/fstab creation as requested on boot commandline." ; eend 0
 else
   checkbootparam "anyswap" && export ANYSWAP='yes' || export ANYSWAP=""
@@ -957,8 +963,8 @@ else
   fi
 fi
 # Scan for swap, config, homedir
-if [ -z "$NOSWAP" -o -z "$INSTALLED" ]; then
-  einfo "Checking for swap partition(s)."
+if [ -z "$NOSWAP" ]; then
+   einfo "Searching for swap partition(s) as requested."
 fi
 GRML_IMG=""
 GRML_SWP=""
@@ -971,7 +977,9 @@ if [ -n "$partitions" ]; then
   case "$f" in swap)
    eindent
    if [ -n "$NOSWAP" ]; then
-    ewarn "Ignoring swap partition ${WHITE}$p${NORMAL} as requested." ; eend 0
+      if [ -z "$INSTALLED" ] ; then
+         ewarn "Ignoring swap partition ${WHITE}$p${NORMAL}. (Force usage via boot option 'swap', or execute grml-swapon)" ; eend 0
+      fi
    else
      case "$(dd if=$p bs=1 count=6 skip=4086 2>/dev/null)" in
              S1SUSP|S2SUSP|pmdisk|[zZ]*)
@@ -1171,7 +1179,14 @@ else
   elif [ ! -e /lib/modules/${KERNEL}/kernel/arch/i386/kernel/cpu/cpufreq -o ! -e /lib/modules/${KERNEL}/kernel/drivers/cpufreq ] ; then
     ewarn "Skipping CPU detection as module dependencies are not fulfilled." ; eend 1
   else
-    einfo "Detecting CPU: `awk -F: '/^processor/{printf " Processor"$2" is"};/^model name/{printf $2};/^vendor_id/{printf vendor};/^cpu MHz/{printf " %dMHz",int($2)};/^cache size/{printf ","$2" Cache"};/^$/{print ""}' /proc/cpuinfo 2>>$DEBUG` " ; eend 0
+    if [[ `grep -c processor /proc/cpuinfo` -gt 1 ]] ; then
+      einfo "Detecting CPU:"
+      CPU=$(awk -F: '/^processor/{printf "	Processor"$2" is"};/^model name/{printf $2};/^vendor_id/{printf vendor};/^cpu MHz/{printf " %dMHz",int($2)};/^cache size/{printf ","$2" Cache"};/^$/{print ""}' /proc/cpuinfo 2>>$DEBUG)
+      echo $CPU | sed 's/ \{1,\}/ /g'
+      eend 0
+    else
+      einfo "Detecting CPU: `awk -F: '/^processor/{printf " Processor"$2" is"};/^model name/{printf $2};/^vendor_id/{printf vendor};/^cpu MHz/{printf " %dMHz",int($2)};/^cache size/{printf ","$2" Cache"};/^$/{print ""}' /proc/cpuinfo 2>>$DEBUG` " ; eend 0
+    fi
     if /usr/sbin/laptop-detect ; then
     einfo "Detected Laptop - trying to use cpu frequency scaling:"
 #      loadcpumod() {
@@ -1330,91 +1345,6 @@ fi
 }
 # }}}
 
-# {{{ Check if we want the config floppy
-config_old_myconfig(){
-MYCONF=""
-case "$CMDLINE" in *\ myconfig*) MYCONF="yes"; ;; esac
-if [ -n "$MYCONF" ]; then
-  einfo "Bootoption myconfig detected." && eend 0
-# Check for given config directory
-  MYCONFDIR="$(getbootparam 'myconfig')"
-  [ -n "$MYCONFDIR" ] || MYCONFDIR="$(getbootparam 'myconfig')"
-fi
-
-# Check for configuration floppy add-on if not running from HD
-if [ -z "$INSTALLED" -a -n "$MYCONF" ]; then
-  FOUND_CONFIG=""
-  if [ -n "$MYCONFDIR" ]; then
-    case "$MYCONFDIR" in
-     /dev/*)
-       MYCONFDEVICE="${MYCONFDIR##/dev/}"
-       MYCONFDEVICE="/dev/${MYCONFDEVICE%%/*}"
-       MYCONFMOUNTPOINT="/mnt/${MYCONFDEVICE##/dev/}"
-       MYCONFDIR="/mnt/${MYCONFDIR##/dev/}"
-      ;;
-     /mnt/*)
-       MYCONFDEVICE="${MYCONFDIR##/mnt/}"
-       MYCONFDEVICE="/dev/${MYCONFDEVICE%%/*}"
-       MYCONFMOUNTPOINT="/mnt/${MYCONFDEVICE##/dev/}"
-      ;;
-     [Aa][Uu][Tt][Oo]|[Ss][Cc][Aa][Nn]|[Ff][Ii][Nn][Dd])
-       MYCONFDIR="$(findfile grml.sh)"
-       if [ -n "$MYCONFDIR" ]; then
-         MYCONFDEVICE="${MYCONFDIR##/mnt/}"
-         MYCONFDEVICE="/dev/${MYCONFDEVICE%%/*}"
-         MYCONFMOUNTPOINT="/mnt/${MYCONFDEVICE##/dev/}"
-         MYCONFDIR="${MYCONFMOUNTPOINT}"
-       else
-         FOUND_CONFIG="none"
-       fi
-      ;;
-     *)
-       eerror "Invalid configdir '$MYCONFDIR' specified (must start with /dev/ or /mnt/ or 'scan')." ; eend 1
-       eerror "Option ignored."
-       FOUND_CONFIG="invalid"
-      ;;
-    esac
-  else
-    MYCONFDEVICE="/dev/fd0"
-    MYCONFMOUNTPOINT="/mnt/floppy"
-    MYCONFDIR="/mnt/floppy"
-  fi
-
-  eindent
-  if [ -z "$FOUND_CONFIG" ]; then
-    einfo "Checking ${WHITE}${MYCONFDIR}${NORMAL} for grml configuration files...${NORMAL}"
-    [ -d $MYCONFMOUNTPOINT ] || mkdir $MYCONFMOUNTPOINT && chown grml: $MYCONFMOUNTPOINT
-    if trymount "$MYCONFDEVICE" "$MYCONFMOUNTPOINT"; then
-      MYCONFIG="$(/bin/ls -1d $MYCONFDIR/[Gg][Rr][Mm][Ll].[Ss][Hh] 2>>$DEBUG)"
-      if [ -n "$MYCONFIG" -a -f "$MYCONFIG" ]; then
-        echo ""
-        FOUND_CONFIG="yes"
-        einfo "Found, now executing ${WHITE}${MYCONFIG}${NORMAL}."
-        echo "6" > /proc/sys/kernel/printk
-        . "$MYCONFIG" "$MYCONFDIR" || true
-        echo "0" > /proc/sys/kernel/printk
-      fi
-      umount "$MYCONFMOUNTPOINT" 2>>$DEBUG
-    fi
-  fi
-  [ -n "$FOUND_CONFIG" ] || eerror "Not present."
-  eoutdent
-fi
-# }}}
-
-# {{{ Check for extra shellscript on CD-ROM (/cdrom/GRML/grml.sh)
-MYCONFIG="$(/bin/ls -1d /cdrom/GRML/[Gg][Rr][Mm][Ll].[Ss][Hh] 2>>$DEBUG)"
-if [ -n "$MYCONFIG" -a -f "$MYCONFIG" ]; then
-  echo ""
-  FOUND_CONFIG="yes"
-  einfo "grml script/configuration file found on CD, executing ${BLUE}${MYCONFIG}${NORMAL}:"
-  echo "6" > /proc/sys/kernel/printk
-  . "$MYCONFIG" /cdrom/GRML || true
-  echo "0" > /proc/sys/kernel/printk
-fi
-}
-# }}}
-
 # {{{ Check for scripts on CD-ROM
 config_cdrom_scripts(){
 if checkbootparam "script"; then
@@ -1451,7 +1381,13 @@ else
           amixer set Front 0% 1>/dev/null
        fi
     fi
-    aumix -w 0 -v 0 -p 0 -m 0 ; eend $?
+    ERROR=$(aumix -w 0 -v 0 -p 0 -m 0 2>&1) ; RC=$?
+    if [ -n "$ERROR" ] ; then
+       eindent
+       eerror "Problem muting sound devices: $ERROR"
+       eoutdent
+    fi
+    eend $RC
   elif [ -z "$INSTALLED" ]; then
       einfo "Setting mixer volumes to level ${WHITE}${VOL}${NORMAL}."
       # some IBM notebooks require the following stuff:
@@ -1461,7 +1397,13 @@ else
             amixer set Front ${VOL}% 1>/dev/null
          fi
       fi
-      aumix -w $VOL -v $VOL -p $VOL -m $VOL ; eend $?
+      ERROR=$(aumix -w $VOL -v $VOL -p $VOL -m $VOL 2>&1) ; RC=$?
+      if [ -n "$ERROR" ] ; then
+         eindent
+         eerror "Problem setting mixer volumes: $ERROR"
+         eoutdent
+      fi
+      eend $RC
   fi
 
 fi
@@ -1689,7 +1631,7 @@ fi
 }
 
 config_automount(){
-if checkbootparam noautoconfig ; then
+if checkbootparam noautoconfig -o checkbootparam forensic ; then
   ewarn "Skipping running automount of device(s) labeled GRMLCFG as requested." ; eend 0
 else
  if [ -z "$INSTALLED" ] ; then
@@ -1736,6 +1678,17 @@ fi
 }
 
 config_myconfig(){
+
+if checkbootparam "config" ; then
+  CONFIG="$(getbootparam 'config' 2>>$DEBUG)"
+  [ -z "$CONFIG" ] && CONFIG='config.tbz'
+  einfo "Bootoption config found. config is set to: $CONFIG"
+  eindent
+    einfo "Trying to extract configuration file ${CONFIG}:"
+    cd / && unp /cdrom/config/$CONFIG $EXTRACTOPTIONS ; eend $?
+  eoutdent
+fi
+
 if checkbootparam myconfig ; then
  MOUNTDEVICE="$(getbootparam 'myconfig' 2>>$DEBUG)"
  if [ -n "$MOUNTDEVICE" ]; then
@@ -1802,24 +1755,11 @@ fi
 config_debs(){
 if checkbootparam "debs" ; then
   DEBS="$(getbootparam 'debs' 2>>$DEBUG)"
-  [ -z "$CONFIG" ] && CONFIG="/cdrom/debs/*"
-  einfo "Tring to install debian package(s) ${DEBS}:"
+  einfo "Tring to install debian package(s) ${DEBS}"
   dpkg -i /cdrom/debs/$DEBS* ; eend $?
 fi
 }
 
-config_config(){
-if checkbootparam "config" ; then
-  CONFIG="$(getbootparam 'config' 2>>$DEBUG)"
-  [ -z "$CONFIG" ] && CONFIG='config.tbz'
-  einfo "Bootoption config found. config is set to: $CONFIG"
-  eindent
-    einfo "Trying to extract configuration file ${CONFIG}:"
-    cd / && unp /cdrom/config/$CONFIG $EXTRACTOPTIONS ; eend $?
-  eoutdent
-fi
-}
-
 config_scripts(){
 if checkbootparam "scripts" ; then
   SCRIPTS="$(getbootparam 'scripts' 2>>$DEBUG)"
@@ -1968,6 +1908,75 @@ fi
 }
 # }}}
 
+# {{{ SW-RAID
+config_swraid(){
+  if [ -z "$INSTALLED" ] ; then
+  # notice: checkbootparam "forensic" is just for users who don't know how to really use the bootoption
+  if checkbootparam 'noraid'   -o checkbootparam 'noswraid' -o \
+     checkbootparam 'forensic' -o checkbootparam 'raid=noautodetect' ; then
+     ewarn "Skipping SW-RAID code as requested on boot commandline." ; eend 0
+  else
+    if ! [ -x /sbin/mdadm ] ; then
+       eerror "mdadm not available, can not execute it." ; eend 1
+    else
+
+       # if ! egrep -qv '^(MAILADDR.*|#.*|)$' /etc/mdadm/mdadm.conf 2>>$DEBUG ; then
+       # find out whether we have a valid configuration file already
+       if ! grep -q ARRAY /etc/mdadm/mdadm.conf 2>>$DEBUG ; then
+          einfo "Creating /etc/mdadm/mdadm.conf for use with mdadm."
+          [ -r /etc/mdadm/mdadm.conf ] && mv /etc/mdadm/mdadm.conf /etc/mdadm/mdadm.conf.old
+          MDADM_MAILADDR__='root' /usr/share/mdadm/mkconf > /etc/mdadm/mdadm.conf ; eend $?
+        else
+          ewarn "/etc/mdadm/mdadm.conf looks like a configured mdadm setup, will not touch it." ; eend 0
+       fi
+
+       if ! checkbootparam 'swraid' ; then 
+          eindent
+          einfo "Just run 'Start mdadm-raid' to assemble md arrays or boot using 'swraid' as bootoption for autostart."
+          eoutdent
+       else
+          einfo "Bootoption swraid found. Searching for software RAID arrays:"
+          eindent
+           IFSOLD=${IFS:-}
+           IFS='
+'
+           for line in $(mdadm --assemble --scan --auto=yes --symlink=no 2>&1) ; do
+               case $line in
+                 *'No arrays found'*)
+                   ewarn "$line" ; eend 0
+                   ;;
+                 *)
+                   einfo "$line" ; eend 0
+                   ;;
+               esac
+           done
+           IFS=$IFSOLD
+         eoutdent
+
+         if [ -r /proc/mdstat ] ; then
+            eindent
+            MDSTAT=$(grep '^md[0-9]' /proc/mdstat)
+            if [ -z "$MDSTAT" ] ; then
+               ewarn "No active arrays found" ; eend 0
+            else
+               IFSOLD=${IFS:-}
+               IFS='
+'
+               for line in $(grep '^md[0-9]' /proc/mdstat) ; do
+                   einfo "active arrays: $line" ; eend 0
+               done
+               IFS=$IFSOLD
+            fi
+            eoutdent
+         fi # /proc/mdstat
+       fi # bootoption swraid
+
+     fi # is /sbin/mdadm executable?
+  fi # check for bootoptions
+  fi # run only in live-cd mode
+}
+# }}}
+
 # {{{ debnet: setup network based on an existing one found on a partition
 config_debnet(){
 if checkbootparam "debnet" ; then
@@ -2076,9 +2085,6 @@ fi
 config_environment(){
   ewarn "config_environment is deprecated. Please set CONFIG_ENVIRONMENT in /etc/grml/autoconfig to 'no'." ; eend 0
 }
-config_running_from() {
-  ewarn "config_running_from is deprecated. Please set CONFIG_RUNNING_FROM in /etc/grml/autoconfig to 'no'." ; eend 0
-}
 config_keyboard(){
   ewarn "config_keyboard is deprecated. Please set CONFIG_KEYBOARD in /etc/grml/autoconfig to 'no'." ; eend 0
 }