From 996cadf9d072aa2f545a63ac85141e60a3721f71 Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Wed, 25 May 2011 14:54:55 +0200 Subject: More ... --- .../plugins/xserver/OpenSLX/Distro/Fedora.pm | 89 ++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 src/os-plugins/plugins/xserver/OpenSLX/Distro/Fedora.pm (limited to 'src/os-plugins/plugins/xserver') diff --git a/src/os-plugins/plugins/xserver/OpenSLX/Distro/Fedora.pm b/src/os-plugins/plugins/xserver/OpenSLX/Distro/Fedora.pm new file mode 100644 index 00000000..13819059 --- /dev/null +++ b/src/os-plugins/plugins/xserver/OpenSLX/Distro/Fedora.pm @@ -0,0 +1,89 @@ +# Copyright (c) 2008..2011 - 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.pm +# - provides SUSE-specific overrides of the Distro API for the xserver +# plugin. +# ----------------------------------------------------------------------------- +package xserver::OpenSLX::Distro::Suse; + +use strict; +use warnings; + +use base qw(xserver::OpenSLX::Distro::Base); + +use File::Path; + +use OpenSLX::Basics; +use OpenSLX::Utils; +use OpenSLX::DistroUtils; + +use Data::Dumper; + +################################################################################ +### interface methods +################################################################################ + +sub setupXserverScript +{ + my $self = shift; + my $repoPath = shift; + + my $script = $self->SUPER::setupXserverScript($repoPath); + + # add stuff to the script generated via Base.pm + $script .= unshiftHereDoc(<<' End-of-Here'); + # SuSE specific extension to stage3 xserver.sh + testmkd /mnt/etc/X11/xorg.conf.d + # Add InputClass to proper setup the keyboard and other input + echo 'Section "InputClass" + Identifier "evdev pointer catchall" + MatchIsPointer "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" + EndSection + Section "InputClass" + Identifier "evdev keyboard catchall" + MatchIsKeyboard "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" + EndSection + Section "InputClass" + Identifier "evdev touchpad catchall" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" + EndSection + Section "InputClass" + Identifier "evdev tablet catchall" + MatchIsTablet "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" + EndSection + Section "InputClass" + Identifier "evdev touchscreen catchall" + MatchIsTouchscreen "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" + EndSection' >/mnt/etc/X11/xorg.conf.d/10-evdev.conf + # Xorg hardware is autodetected, so no module information provided + [ -z "${xmodule}" ] && \ + sed "/Section \"Device\"/,/EndSection/d" -i ${xfc} + testmkd /mnt/var/lib/xkb/compiled + testmkd /mnt/var/lib/X11 + testmkd /mnt/var/lib/xdm/authdir/authfiles 0700 + ln -s /usr/bin/Xorg /mnt/var/lib/X11/X + rm /mnt/etc/X11/xdm/SuSEconfig.xdm + End-of-Here + + return $script; +} + +1; -- cgit v1.2.3-55-g7522 From 5f11e7e2121dfbdd0b8d49ded7beb99c0c4ffdfc Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Wed, 25 May 2011 15:45:29 +0200 Subject: More Fedora stuff (unchanged mostly ...) --- src/os-plugins/plugins/profile/OpenSLX/Distro/Fedora.pm | 4 ++-- src/os-plugins/plugins/xserver/OpenSLX/Distro/Fedora.pm | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/os-plugins/plugins/xserver') diff --git a/src/os-plugins/plugins/profile/OpenSLX/Distro/Fedora.pm b/src/os-plugins/plugins/profile/OpenSLX/Distro/Fedora.pm index 433f6f7f..fd72c015 100644 --- a/src/os-plugins/plugins/profile/OpenSLX/Distro/Fedora.pm +++ b/src/os-plugins/plugins/profile/OpenSLX/Distro/Fedora.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2009 - OpenSLX GmbH +# Copyright (c) 2011 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -9,7 +9,7 @@ # General information about OpenSLX can be found at http://openslx.org/ # ----------------------------------------------------------------------------- # profile/OpenSLX/Distro/Fedora.pm -# - provides Fedora-specific overrides of the Distro API for the profile +# - provides fedora-specific overrides of the Distro API for the profile # plugin. # ----------------------------------------------------------------------------- package profile::OpenSLX::Distro::Fedora; diff --git a/src/os-plugins/plugins/xserver/OpenSLX/Distro/Fedora.pm b/src/os-plugins/plugins/xserver/OpenSLX/Distro/Fedora.pm index 13819059..6bfda47e 100644 --- a/src/os-plugins/plugins/xserver/OpenSLX/Distro/Fedora.pm +++ b/src/os-plugins/plugins/xserver/OpenSLX/Distro/Fedora.pm @@ -8,11 +8,11 @@ # # General information about OpenSLX can be found at http://openslx.org/ # ----------------------------------------------------------------------------- -# xserver/OpenSLX/Distro/Suse.pm -# - provides SUSE-specific overrides of the Distro API for the xserver +# xserver/OpenSLX/Distro/fedora.pm +# - provides fedora-specific overrides of the Distro API for the xserver # plugin. # ----------------------------------------------------------------------------- -package xserver::OpenSLX::Distro::Suse; +package xserver::OpenSLX::Distro::fedora; use strict; use warnings; @@ -40,7 +40,7 @@ sub setupXserverScript # add stuff to the script generated via Base.pm $script .= unshiftHereDoc(<<' End-of-Here'); - # SuSE specific extension to stage3 xserver.sh + # fedora specific extension to stage3 xserver.sh testmkd /mnt/etc/X11/xorg.conf.d # Add InputClass to proper setup the keyboard and other input echo 'Section "InputClass" @@ -80,7 +80,7 @@ sub setupXserverScript testmkd /mnt/var/lib/X11 testmkd /mnt/var/lib/xdm/authdir/authfiles 0700 ln -s /usr/bin/Xorg /mnt/var/lib/X11/X - rm /mnt/etc/X11/xdm/SuSEconfig.xdm + rm /mnt/etc/X11/xdm/fedoraconfig.xdm End-of-Here return $script; -- cgit v1.2.3-55-g7522