################################################################################
# {{{ 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)"
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
}
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
fi
if [[ $(grep -c processor /proc/cpuinfo) -gt 1 ]] ; then
- einfo "Detecting CPU:"
+ einfo "Found 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
+ einfo "Found 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
# no cpufreq setup inside VirtualBox
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
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
}
# }}}
-# {{{ 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
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