Don't load cpufreq governor if cpufreq is unsupported

[grml-autoconfig.git] / autoconfig.functions

diff --git a/autoconfig.functions b/autoconfig.functions
index ff1052f..ab86db6 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -7,7 +7,7 @@
 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh
-export PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin"
+export PATH="/bin:/sbin:/usr/bin:/usr/sbin"
 DEBUG="/dev/null"
 KERNEL="$(uname -r)"
 ARCH="$(uname -m)"
@@ -551,7 +551,7 @@ eoutdent
 config_fast(){
 if checkbootparam 'fast'; then
   ewarn "Bootoption fast detected. Skipping startup of grml-quickconfig."
-    sed -i 's#^1:.*#1:12345:respawn:/usr/bin/openvt -f -c 1 -w -- /bin/zsh#' /etc/inittab
+    sed -i '/1:/s#/usr/share/grml-scripts/run-welcome#/bin/zsh#' /etc/inittab
   /sbin/telinit q ; eend $?
 fi
 }
@@ -717,7 +717,7 @@ else
   else
     ewarn "(none)" ; eend 1
   fi
-  if ! ps x 2>>$DEBUG | grep -q /usr/sbin/acpid ; then
+  if ! pgrep acpid >/dev/null ; then
     einfo "Starting acpi daemon."
     /etc/init.d/acpid start >>$DEBUG 2>&1 ; eend $?
   else
@@ -964,6 +964,7 @@ if [ -x /etc/init.d/loadcpufreq ] ; then
       if [ -n "$MODULE" -a "$MODULE" != none ]; then
          einfo "Loading cpufreq kernel module $MODULE" ; eend 0
       else
+         SKIP_CPU_GOVERNOR=1
          ewarn "Could not find an appropriate kernel module for cpu frequency scaling." ; eend 1
       fi
    fi
@@ -1395,7 +1396,7 @@ EOF
     eerror " -> Please use something like xdm, gdm or kdm for starting X on a harddisk system!" ; eend 1
   fi
  else
-   eerror "/usr/X11R6/bin/X is not present on this grml flavour."
+   eerror "/usr/bin/X is not present on this grml flavour."
    eerror "  -> Boot parameter startx does not work therefore." ; eend 1
  fi
 fi
@@ -1724,6 +1725,7 @@ config_swraid(){
      checkbootparam 'forensic' || checkbootparam 'raid=noautodetect' ; then
      ewarn "Skipping SW-RAID code as requested on boot commandline." ; eend 0
   else
+    [ -e /proc/mdstat ] || modprobe md_mod
     if ! [ -x /sbin/mdadm ] ; then
        eerror "mdadm not available, can not execute it." ; eend 1
     else