From 607e3379d36d699883c31fc57d954f9d601f3084 Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Mon, 9 Aug 2010 14:36:48 +0200 Subject: Fixing the double typo bug as reported in the mailinglist. --- .../plugins/xserver/OpenSLX/Distro/Suse_10.pm | 63 ++++++++++++++++++++++ .../plugins/xserver/OpenSLX/Distro/Suse_10_2.pm | 61 --------------------- os-plugins/plugins/xserver/XX_xserver.sh | 2 +- 3 files changed, 64 insertions(+), 62 deletions(-) create mode 100644 os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10.pm delete mode 100644 os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10_2.pm diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10.pm new file mode 100644 index 00000000..f0c3ebb8 --- /dev/null +++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10.pm @@ -0,0 +1,63 @@ +# Copyright (c) 2008..2010 - OpenSLX GmbH +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# xserver/OpenSLX/Distro/Suse_10.pm +# - provides SUSE-specific overrides of the Distro API for the xserver +# plugin. +# ----------------------------------------------------------------------------- +package xserver::OpenSLX::Distro::Suse_10; + +use strict; +use warnings; + +use base qw(xserver::OpenSLX::Distro::Base); + +use File::Path; + +use OpenSLX::Basics; +use OpenSLX::Utils; + +################################################################################ +### interface methods +################################################################################ + +sub setupXserverScript +{ + my $self = shift; + my $repoPath = shift; + + my $script = $self->SUPER::setupXserverScript($repoPath); + + $script .= unshiftHereDoc(<<' End-of-Here'); + # suse specific extension to stage3 xserver.sh + testmkd /mnt/var/lib/xkb/compiled + testmkd /mnt/var/X11R6/bin + ln -s /usr/bin/Xorg /mnt/var/X11R6/bin/X + rm /mnt/etc/X11/xdm/SuSEconfig.xdm + # use the old kbd keyboard driver instead of evdev + sed "s/\"evdev\"/,/\"kbd\"/" -i ${xfc} + # relevant for older xservers only: check for kind of xorg module used + # and patch the i8,9XX VGA BIOS if needed + #if strinfile '"i810"' $xfc && [ -f /etc/hwinfo.display ] ; then + # highres=$(sort -run /etc/hwinfo.display|grep -i x -m 1) + # 915resolution -l|sed -n "s/Mode //;/32 bits/p" > /tmp/915res + # strinfile ${highres} /tmp/915res || { + # 915resolution $(grep -i x -m 1 /tmp/915res|sed "s/\ :.*//") $(echo \ + # $highres|sed "s/x/\ /") 2>&1 >/dev/null; + # # for some reason the above does not work for a Dell laptop with Intel + # # 855 chipset, so add another mode too + # 915resolution 3c $(echo $highres|sed "s/x/\ /") 2>&1 >/dev/null; } + #fi + End-of-Here + + return $script; +} + +1; diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10_2.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10_2.pm deleted file mode 100644 index f72ba877..00000000 --- a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10_2.pm +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright (c) 2008 - OpenSLX GmbH -# -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING -# -# If you have any feedback please consult http://openslx.org/feedback and -# send your suggestions, praise, or complaints to feedback@openslx.org -# -# General information about OpenSLX can be found at http://openslx.org/ -# ----------------------------------------------------------------------------- -# xserver/OpenSLX/Distro/Suse_10_2.pm -# - provides SUSE-specific overrides of the Distro API for the xserver -# plugin. -# ----------------------------------------------------------------------------- -package xserver::OpenSLX::Distro::Suse_10_2; - -use strict; -use warnings; - -use base qw(xserver::OpenSLX::Distro::Base); - -use File::Path; - -use OpenSLX::Basics; -use OpenSLX::Utils; - -################################################################################ -### interface methods -################################################################################ - -sub setupXserverScript -{ - my $self = shift; - my $repoPath = shift; - - my $script = $self->SUPER::setupXserverScript($repoPath); - - $script .= unshiftHereDoc(<<' End-of-Here'); - # suse specific extension to stage3 xserver.sh - testmkd /mnt/var/lib/xkb/compiled - testmkd /mnt/var/X11R6/bin - ln -s /usr/bin/Xorg /mnt/var/X11R6/bin/X - rm /mnt/etc/X11/xdm/SuSEconfig.xdm - # relevant for older xservers only: check for kind of xorg module used - # and patch the i8,9XX VGA BIOS if needed - #if strinfile '"i810"' $xfc && [ -f /etc/hwinfo.display ] ; then - # highres=$(sort -run /etc/hwinfo.display|grep -i x -m 1) - # 915resolution -l|sed -n "s/Mode //;/32 bits/p" > /tmp/915res - # strinfile ${highres} /tmp/915res || { - # 915resolution $(grep -i x -m 1 /tmp/915res|sed "s/\ :.*//") $(echo \ - # $highres|sed "s/x/\ /") 2>&1 >/dev/null; - # # for some reason the above does not work for a Dell laptop with Intel - # # 855 chipset, so add another mode too - # 915resolution 3c $(echo $highres|sed "s/x/\ /") 2>&1 >/dev/null; } - #fi - End-of-Here - - return $script; -} - -1; diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh index a2318c9f..1b757901 100644 --- a/os-plugins/plugins/xserver/XX_xserver.sh +++ b/os-plugins/plugins/xserver/XX_xserver.sh @@ -49,7 +49,7 @@ x_mouse='Section "InputDevice" EndSection' x_keyboard='Section "InputDevice" Identifier "Generic Keyboard" - Driver "kbd" + Driver "evdev" Option "CoreKeyboard" Option "XkbRules" "xorg" Option "XkbModel" "pc105" -- cgit v1.2.3-55-g7522