Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7f79f1a87ea4b695dec3f8649110efa3718ca3db

commit 7f79f1a87ea4b695dec3f8649110efa3718ca3db
Author: James Buren <[email protected]>
Date:   Fri Dec 7 06:50:45 2012 -0600

xorg-server-1.13.0.901-2-x86_64
* fix install script to work with new /etc/vconsole.conf

diff --git a/source/x11/xorg-server/xorg-server.install 
b/source/x11/xorg-server/xorg-server.install
index 4db4879..5691218 100644
--- a/source/x11/xorg-server/xorg-server.install
+++ b/source/x11/xorg-server/xorg-server.install
@@ -1,25 +1,10 @@
-function UpdateConf
-{
-       Driver=$1
-       #update configuration only one time
-       #we have a backup for this file
-       if [ "`grep DeviceGraphic /etc/X11/xorg.conf.d/20-graphical.conf`" != 
"" ]; then
-               #for ppc we should use nv works better that nouveau
-               if [ "`uname -a | grep ppc `" != "" ] && [ "$Driver" == 
"nouveau" ] ; then
-                       Driver="nv"
-               fi
-               echo "updating graphical device with $Driver"
-               sed -i "/Driver/s/DeviceGraphic/$Driver/" 
/etc/X11/xorg.conf.d/20-graphical.conf
-       fi
-}
-
post_install()
{
layout="us"
Findxkb="0"
-       if [ -e /etc/sysconfig/keymap ]; then
+       if [ -e /etc/vconsole.conf ]; then
# setting the layout from the tty console layout created by the installer
-               layout=`awk -F'=' '/^keymap=/ {print $2}' /etc/sysconfig/keymap 
| sed 's|-.*||g'`
+               layout=`awk -F'=' '/^KEYMAP=/ {print $2}' /etc/vconsole.conf | 
sed 's|-.*||g'`
#if we should fix some others layout
#FS#4353
case "$layout" in
@@ -59,7 +44,6 @@ post_install()
fi
echo "Update layout keyboard with $layout"
sed -i "/XkbLayout/s/Keyboard_Layout/$layout/" 
/etc/X11/xorg.conf.d/10-evdev.conf
-
}

post_upgrade()
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to