# 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: Mit Jän 24 10:33:23 CET 2007 [mika]
################################################################################
# {{{ path, variables, signals, umask, zsh
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
- if [ -r /usr/share/consolefonts/Uni3-Terminus14.psf.gz ] ; then
- CONSOLEFONT='Uni3-Terminus14'
+ if [ -r /usr/share/consolefonts/Uni3-Terminus16.psf.gz ] ; then
+ CONSOLEFONT='Uni3-Terminus16'
else
- ewarn "/usr/share/consolefonts/Uni3-Terminus14.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
config_kernel(){
vmware-detect &>/dev/null && VMWARE="inside ${WHITE}VMWare${NORMAL}"
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
}
# }}}
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