# 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: Mon Nov 27 21:02:23 CET 2006 [mika]
+# Latest change: Mon Feb 19 18:59:09 CET 2007 [mika]
################################################################################
# {{{ path, variables, signals, umask, zsh
# set default to 'en' in live-cd mode if $LANGUAGE is not yet set:
if [ -z "$INSTALLED" ] ; then
- [ -n "$LANGUAGE" ] || LANGUAGE='en'
+ [ -n "$LANGUAGE" ] || LANGUAGE='en-utf8'
fi
# if bootoption lang is used update /etc/default/locale, otherwise *not*!
if [ -z "$CONSOLEFONT" ] ; then
if ! checkbootparam "nodefaultfont" >>$DEBUG 2>&1 ; then
# [ -n "$UTF8" ] && CONSOLEFONT='LatArCyrHeb-16' || CONSOLEFONT='Lat15-Terminus16'
- if [ -r /usr/share/consolefonts/Lat15-Terminus16.psf.gz ] ; then
- CONSOLEFONT='Lat15-Terminus16'
+ # if [ -r /usr/share/consolefonts/Lat15-Terminus16.psf.gz ] ; then
+ if [ -r /usr/share/consolefonts/Uni3-Terminus16.psf.gz ] ; then
+ CONSOLEFONT='Uni3-Terminus16'
else
- ewarn "/usr/share/consolefonts/Lat15-Terminus16.psf.gz not available. Please upgrade package console-terminus." ; eend 1
+ ewarn "/usr/share/consolefonts/Uni3-Terminus16.psf.gz not available. Please upgrade package console-terminus." ; eend 1
fi
fi
fi
einfo "Running consolechars using ${CONSOLEFONT}"
consolechars -f $CONSOLEFONT || consolechars -d
eend $?
-
- if [ -n "$UTF8" ] ; then
- einfo "Notice: run 'filterm - dynafont' in your shell to enable a unicode capable console."
- fi
fi
# we have to set up all consoles, therefore loop it over all ttys:
if [ -n "$CHARMAP" ] ; then
- einfo "Running consolechars for ${CHARMAP}"
- NUM_CONSOLES=`fgconsole --next-available`
- NUM_CONSOLES=`expr ${NUM_CONSOLES} - 1`
- [ ${NUM_CONSOLES} -eq 1 ] && NUM_CONSOLES=6
- for vc in `seq 0 ${NUM_CONSOLES}` ; do
- consolechars --tty=/dev/tty${vc} -m ${CHARMAP} ; RC=$?
- done
- eend ${RC}
+ einfo "Running consolechars for ${CHARMAP}"
+ NUM_CONSOLES=`fgconsole --next-available`
+ NUM_CONSOLES=`expr ${NUM_CONSOLES} - 1`
+ [ ${NUM_CONSOLES} -eq 1 ] && NUM_CONSOLES=6
+ for vc in `seq 0 ${NUM_CONSOLES}` ; do
+ consolechars --tty=/dev/tty${vc} -m ${CHARMAP} ; RC=$?
+ done
+ eend ${RC}
+ fi
+
+ # activate unicode console if running within utf8 environment
+ if [ -r /etc/default/locale ] ; then
+ if grep -q "LANG=.*UTF" /etc/default/locale ; then
+ einfo "Setting up unicode environment."
+ unicode_start
+ eend $?
+ fi
fi
eoutdent
checkbootparam utc >>$DEBUG 2>&1 && UTC="-u"
checkbootparam gmt >>$DEBUG 2>&1 && UTC="-u"
# hwclock uses the TZ variable
- export TZ
- hwclock $UTC -s
+ if [ -r /etc/default/locale ] ; then
+ . /etc/default/locale
+ else
+ TZ=Europe/Vienna
+ fi
+ ERROR=$(TZ="$TZ" hwclock $UTC -s 2>&1) ; RC=$?
+ if [ -n "$ERROR" ] ; then
+ eindent
+ ERROR=$(TZ="$TZ" hwclock $UTC -s --directisa 2>&1)
+ if [ -n "$ERROR" ] ; then
+ eerror "Problem running hwclock: $ERROR" ; eend 1
+ fi
+ eoutdent
+ fi
fi
}
# }}}
# {{{ print kernel info
config_kernel(){
vmware-detect &>/dev/null && VMWARE="inside ${WHITE}VMWare${NORMAL}"
+ [ -d /proc/xen ] && VMWARE='' # vmware-detect returns '0' when running with a Xen-enabled kernel
einfo "Running Linux Kernel $KERNEL $VMWARE" ; eend 0
+ if [ -r /proc/cpuinfo ] ; then
+ if egrep -q '^flags.*(vmx|svm)' /proc/cpuinfo ; then
+ eindent
+ einfo 'CPU(s) featuring virtualization technology detected' ; eend 0
+ eoutdent
+ fi
+ fi
+ if [ -d /proc/xen ] ; then
+ eindent
+ einfo 'Running kernel featuring support for Xen detected' ; eend 0
+ eoutdent
+ fi
}
# }}}
case "$f" in swap)
eindent
if [ -n "$NOSWAP" ]; then
- ewarn "Ignoring swap partition ${WHITE}$p${NORMAL}. (Force usage via boot option 'swap', or execute grml-swapon)" ; eend 0
+ if [ -z "$INSTALLED" ] ; then
+ ewarn "Ignoring swap partition ${WHITE}$p${NORMAL}. (Force usage via boot option 'swap', or execute grml-swapon)" ; eend 0
+ fi
else
case "$(dd if=$p bs=1 count=6 skip=4086 2>/dev/null)" in
S1SUSP|S2SUSP|pmdisk|[zZ]*)
sudo -u $fstabuser -i /usr/bin/grml-x $WINDOWMANAGER 1>>$DEBUG
EOF
chmod 755 /etc/init.d/xstartup
- sed -i 's/^allowed_users=.*/allowed_users=anybody/' /etc/X11/Xwrapper.config
- sed -i 's#^6.*#6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /bin/zsh"#' /etc/inittab
+
+ sed -i 's#^6:.*#6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /bin/zsh"#' /etc/inittab
+
/sbin/telinit q ; eend $?
+
+ if grep -q '^allowed_users=' /etc/X11/Xwrapper.config ; then
+ sed -i 's/^allowed_users=.*/allowed_users=anybody/' /etc/X11/Xwrapper.config
+ else
+ echo 'allowed_users=anybody' >> /etc/X11/Xwrapper.config
+ fi
+
else
eerror "We are not running from CD - startx will not work, skipping it.
Please use something like xdm, gdm or kdm for starting X on a harddisk system!" ; eend 1
ewarn "/etc/mdadm/mdadm.conf looks like a configured mdadm setup, will not touch it." ; eend 0
fi
- if ! checkbootparam 'swraid' ; then
+ if ! checkbootparam 'swraid' ; then
eindent
einfo "Just run 'Start mdadm-raid' to assemble md arrays or boot using 'swraid' as bootoption for autostart."
eoutdent