################################################################################
# {{{ 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)"
fi
if [ -f /sys/class/firmware/timeout ] ; then
einfo "Setting timeout for firmware loading to ${TIMEOUT}."
- echo 100 > /sys/class/firmware/timeout ; eend $?
+ echo $TIMEOUT > /sys/class/firmware/timeout ; eend $?
fi
}
# }}}
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
}
}
# }}}
-# {{{ Bring up loopback interface now
-config_local_net(){
- if [ -z "$INSTALLED" ] ; then
- if grep -q 'iface lo inet loopback' /etc/network/interfaces 2>/dev/null ; then
- grep -q lo=lo /etc/network/run/ifstate 2>/dev/null || ifup lo
- else
- ifconfig lo up
- fi
- fi
-}
-# }}}
-
# {{{ copy passwd-lockfile to ramdisk (fix unionfs-behaviour)
# otherwise we will get: passwd: Authentication token lock busy
config_fix_passwd(){
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
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
rm -f $LOADCPUFREQ
if [ -z "$SKIP_CPU_GOVERNOR" ] ; then
- einfo "Loading cpufreq_ondemand, setting ondemand governor"
- RC=0
- if modprobe cpufreq_ondemand ; RC=$? ; then
- for file in $(find /sys/devices/system/cpu/ -name scaling_governor 2>/dev/null) ; do
- echo ondemand > $file
- done
- fi
- eend $RC
+ if grep -vq ondemand /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors; then
+ einfo "Loading cpufreq_ondemand"
+ modprobe cpufreq_ondemand
+ eend $?
+ fi
+
+ einfo "Setting ondemand governor"
+ RC=0
+ for file in $(find /sys/devices/system/cpu/ -name scaling_governor 2>/dev/null) ; do
+ echo ondemand > $file || RC=1
+ done
+ eend $RC
fi # cpu-governor
eoutdent
for CONTROL in Master PCM ; do
if amixer -q | grep -q "Simple mixer control '$CONTROL'" ; then
+ amixer -q set "${CONTROL}" unmute 1>/dev/null 2>&1
amixer -q set "${CONTROL}" "${VOL}"%
eend $?
fi
}
# }}}
+# {{{ stats
+config_stats() {
+ if ! checkbootparam 'nostats' ; then
+ BASE_URL="http://stats.grml.org/report/"
+ ACTION_NAME=Boot
+
+ HOST_ID=$(cat /proc/sys/kernel/random/boot_id)
+
+ grep -q " lm " /proc/cpuinfo && HAS_64BIT="1" || HAS_64BIT="0"
+ DATE_STRING=$(date +'h=%H&m=%M&s=%S')
+ [ -e /etc/grml_version ] && VERSION=$(cat /etc/grml_version) || \
+ VERSION=$(lsb_release -d | awk -F: '{gsub(/^[ \t]+/, "", $2); print $2}')
+
+ PARAMS="$( echo "$CMDLINE" | sed -e 's/=[^ ]*/=x/g' | tr " " "\n"|sort|tr "\n" " " )"
+
+ echo "$CMDLINE" | grep -q -e "fetch" -e "nfsroot" && BOOT="remote"
+ [ -z "$BOOT" ] && BOOT="local"
+
+ ADDITIONAL_PARAMS=""
+ ( [ -n "$COLUMNS" ] && [ -n "$LINES" ] ) && \
+ ADDITIONAL_PARAMS="$ADDITIONAL_PARAMS&res=$((COLUMNS * 8))x$((LINES * 16))"
+
+ URI='$BASE_URL?action=${ACTION_NAME}\&$DATE_STRING\&unique_id=${HOST_ID}\&support_64bit=$HAS_64BIT\&version=$VERSION\&bootup=$BOOT\¶ms=$PARAMS$ADDITIONAL_PARAMS'
+
+ get_remote_file "$URI" "/dev/null" >/dev/null 2>&1 &!
+ fi
+}
+# }}}
# {{{ fix/workaround for unionfs
fix_unionfs(){
if [ -z "$INSTALLED" ]; then
if [ -z "$INSTALLED" ] ; then
WINDOWMANAGER="$(getbootparam 'startx' 2>>$DEBUG)"
if [ -z "$WINDOWMANAGER" ] ; then
- einfo "No window manager specified. Taking ${WHITE}wm-ng${NORMAL} as default." && eend 0
- WINDOWMANAGER="wm-ng"
+ einfo "No window manager specified. Using default one." && eend 0
else
einfo "Window manager ${WHITE}${WINDOWMANAGER}${NORMAL} found as bootoption." && eend 0
fi
config_userfstab || fstabuser='grml'
cat>|/etc/init.d/xstartup<<EOF
#!/bin/sh
-su $fstabuser -c "/usr/bin/grml-x $WINDOWMANAGER"
+su $fstabuser -c "/usr/bin/grml-x"
EOF
chmod 755 /etc/init.d/xstartup
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
projects / grml-autoconfig.git / blobdiff