# 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: Fre Nov 16 08:45:53 CET 2007 [mika]
+# Latest change: Mon Jän 14 21:34:16 CET 2008 [mika]
################################################################################
# {{{ path, variables, signals, umask, zsh
else
if [ -z "$INSTALLED" ] ; then
if vmware-detect || stringinstring "BOOT_IMAGE=vmware " "$CMDLINE" ; then
- if ! checkbootparam qemu ; then
+ if ! checkbootparam qemu ; then
if [ -r /etc/X11/xorg.conf.vmware ] ; then
einfo "VMware: Copying /etc/X11/xorg.conf.vmware to /etc/X11/xorg.conf"
cp /etc/X11/xorg.conf.vmware /etc/X11/xorg.conf ; eend $?
fi
fi
+ elif [ -r /proc/acpi/battery/BAT0/info -a -r /etc/X11/xorg.conf.virtualbox ] ; then
+ if grep -q 'OEM info: innotek' /proc/acpi/battery/BAT0/info ; then
+ einfo 'Virtual Box: Copying /etc/X11/xorg.conf.virtualbox to /etc/X11/xorg.conf'
+ cp /etc/X11/xorg.conf.virtualbox /etc/X11/xorg.conf ; eend $?
+ fi
fi
fi
fi
}
# }}}
-# update_progress {{{
-update_progress(){
- # be sure we are non-blocking
- (echo "$1" > /etc/sysconfig/progress) &
-}
-# }}}
-
# {{{ timezone
config_timezone(){
# don't touch the files if running from harddisk:
einfo "Bootoption blacklist found."
BLACK="$(getbootparam 'blacklist' 2>>$DEBUG)"
if [ -n "$BLACK" ] ; then
- einfo "Blacklisting module ${BLACK} via /etc/modprobe.d/grml."
- echo "# begin entry generated by config_blacklist of grml-autoconfig" >> /etc/modprobe.d/grml
- echo "blacklist $BLACK" >> /etc/modprobe.d/grml
- echo "alias $BLACK off" >> /etc/modprobe.d/grml
- echo "# end entry generated by config_blacklist of grml-autoconfig" >> /etc/modprobe.d/grml ; eend $?
+ for module in $(echo ${BLACK//,/ }) ; do
+ einfo "Blacklisting module ${module} via /etc/modprobe.d/grml."
+ echo "# begin entry generated by config_blacklist of grml-autoconfig" >> /etc/modprobe.d/grml
+ echo "blacklist $module" >> /etc/modprobe.d/grml
+ echo "alias $module off" >> /etc/modprobe.d/grml
+ echo "# end entry generated by config_blacklist of grml-autoconfig" >> /etc/modprobe.d/grml ; eend $?
+ done
else
eerror "No given module for blacklist found. Blacklisting will not work therefore."
fi
else
- ewarn "Backlisting via bootoption does not work on harddisk installations." ; eend 1
+ ewarn "Backlisting via bootoption is not intended for use on harddisk installations." ; eend 1
eindent
- einfo "Please blacklist the module(s) via /etc/modprobe.d/blacklist."
+ einfo "Please blacklist the module(s) manually using the 'blacklist' script."
eoutdent
fi
fi