# 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
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
+# 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:
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
}
# }}}
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
+
+ if grep -q xstartup /etc/inittab ; then
+ sed -i 's#^6.*#6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /bin/zsh"#' /etc/inittab
+ else
+ echo '6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /bin/zsh"' >> /etc/inittab
+ fi
/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
if ! checkbootparam 'swraid' ; then
eindent
- einfo "Just run 'Start mdadm-raid' to assemble md arrays or boot using swraid bootoption for autostart."
+ einfo "Just run 'Start mdadm-raid' to assemble md arrays or boot using 'swraid' as bootoption for autostart."
eoutdent
else
einfo "Bootoption swraid found. Searching for software RAID arrays:"