X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=081aaca840226324ff70db673767a4bc3aab915f;hp=6fa4d37c1398d72e4d08e05bee8dd4002b084505;hb=a18ac56c34c92e182116c7811eb90edce9f3ccc1;hpb=a5945ace72e7ebc689462fea3947715357a39b3f

diff --git a/autoconfig.functions b/autoconfig.functions
index 6fa4d37..081aaca 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -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
 }
@@ -697,6 +697,8 @@ if checkbootparam 'noacpi'; then
   ewarn "ACPI: Not loading modules as requested by boot option \"noacpi\"." ; eend 0
 elif checkbootparam 'nogrmlacpi' ; then
   ewarn "ACPI: Not loading modules as requested by boot option \"nogrmlacpi\"." ; eend 0
+elif [ ! -d /proc/acpi ] ; then
+  ewarn "ACPI: Kernel support not present." ; eend 0
 else
   einfo "ACPI: Loading modules (disable with boot option noacpi / nogrmlacpi): "
   eindent
@@ -715,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
@@ -1713,38 +1715,6 @@ fi
 }
 # }}}
 
-# {{{ 915resolution
-config_915resolution(){
-if checkbootparam '915resolution' ; then
- OPTIONS="$(getbootparam '915resolution' 2>>$DEBUG)"
-  if [ -x /usr/sbin/915resolution ]; then
-    CMD=915resolution
-    MODE=""
-    XRESO=""
-    YRESO=""
-    if [ -n "$OPTIONS" ]; then
-      # Extra options
-      MODE="${OPTIONS%%,*}"
-      R="${OPTIONS#*,}"
-      if [ -n "$R" -a "$R" != "$OPTIONS" ]; then
-        OPTIONS="$R"
-        XRESO="${OPTIONS%%,*}"
-        R="${OPTIONS#*,}"
-        if [ -n "$R" -a "$R" != "$OPTIONS" ]; then
-          OPTIONS="$R"
-          YRESO="${OPTIONS%%,*}"
-          R="${OPTIONS#*,}"
-        fi
-      fi
-    fi
-    einfo "Running 915resolution with options ${MODE} ${XRESO} ${YRESO}."
-    [ -n "$MODE" ] && [ -n "$XRESO"  ] && [ -n "$YRESO" ]  && ( sh -c "$CMD $MODE $XRESO $YRESO" & )
-    eend 0
-  fi
-fi
-}
-# }}}
-
 # {{{ SW-RAID
 config_swraid(){
   [ -n "$INSTALLED" ] && return 0
@@ -1754,6 +1724,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