# 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: Die Sep 04 12:36:35 CEST 2007 [mika]
+# Latest change: Don Sep 06 23:57:02 CEST 2007 [mika]
################################################################################
# {{{ path, variables, signals, umask, zsh
# {{{ Check if we are running from the grml-CD or HD
INSTALLED=""
-{ [ -e /GRML/etc/grml_cd ] || [ -r /etc/grml_cd ] } && INSTALLED="yes"
+[ -e /etc/grml_cd ] || INSTALLED="yes"
# testcd
TESTCD=""
}
# }}}
-# {{{ Check if we are in interactive startup mode
-INTERACTIVE=""
-stringinstring "BOOT_IMAGE=expert " "$CMDLINE" && INTERACTIVE="yes"
-# }}}
-
# {{{ set firmware timeout via bootparam
config_fwtimeout(){
if checkbootparam fwtimeout ; then
# write keyboard related variables to file for later use
[ -d /etc/sysconfig ] || mkdir /etc/sysconfig
- echo "KEYTABLE=\"$KEYTABLE\"" > /etc/sysconfig/keyboard
- echo "XKEYBOARD=\"$XKEYBOARD\"" >> /etc/sysconfig/keyboard
- echo "KDEKEYBOARD=\"$KDEKEYBOARD\"" >> /etc/sysconfig/keyboard
- echo "KDEKEYBOARDS=\"$KDEKEYBOARDS\"" >> /etc/sysconfig/keyboard
+ if ! [ -e /etc/sysconfig/keyboard ] ; then
+ echo "KEYTABLE=\"$KEYTABLE\"" > /etc/sysconfig/keyboard
+ echo "XKEYBOARD=\"$XKEYBOARD\"" >> /etc/sysconfig/keyboard
+ echo "KDEKEYBOARD=\"$KDEKEYBOARD\"" >> /etc/sysconfig/keyboard
+ echo "KDEKEYBOARDS=\"$KDEKEYBOARDS\"" >> /etc/sysconfig/keyboard
+ fi
fi
[ -r /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard
# Set default keyboard before interactive setup
if [ -n "$KEYTABLE" ] ; then
- einfo "Running loadkeys for ${WHITE}${KEYTABLE}${NORMAL} in background"
- loadkeys -q $KEYTABLE &
- eend $?
+ einfo "Running loadkeys for ${WHITE}${KEYTABLE}${NORMAL} in background"
+ loadkeys -q $KEYTABLE &
+ eend $?
fi
# we have to set up all consoles, therefore loop it over all ttys:
# {{{ Interactive configuration
config_interactive(){
-if [ -n "$INTERACTIVE" ] ; then
-einfo "Entering interactive configuration second stage."
-
- echo " ${GREEN}Your console keyboard defaults to: ${MAGENTA}${KEYTABLE}"
- echo -n "${CYAN}Do you want to (re)configure your console keyboard?${NORMAL} [Y/n] "
- read a
- [ "$a" != "n" ] && /usr/sbin/dpkg-reconfigure console-data ; eend $?
-
- echo -n "${CYAN}Do you want to (re)configure your soundcard?${NORMAL} [Y/n] "
- read a
- [ "$a" != "n" ] && alsaconf && ( exec aumix -m 0 >>$DEBUG 2>&1 & ) ; eend $?
-
- echo -n "${CYAN}Do you want to (re)configure your graphics (X11) subsystem?${NORMAL} [Y/n] "
- read a
- [ "$a" != "n" ] && xorgcfg -textmode ; eend $?
- echo " ${GREEN}Interactive configuration finished. Everything else should be fine for now.${NORMAL}"
-fi
-eend 0
+ ewarn "config_interactive is deprecated nowadays."
+ ewarn "Please set CONFIG_INTERACTIVE='no' in /etc/grml/autoconfig" ; eend 0
}
# }}}