diff options
| author | Dirk von Suchodoletz | 2009-03-06 02:57:58 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2009-03-06 02:57:58 +0100 |
| commit | 1506e23a1e344328fc57b16d8631b294dc35a4b8 (patch) | |
| tree | 6bf5e999bbbcb8a2297bee082708076b13d83c51 /os-plugins | |
| parent | ModulePath should be enabled when using non-gpl drivers ... (bug of former ch... (diff) | |
| download | core-1506e23a1e344328fc57b16d8631b294dc35a4b8.tar.gz core-1506e23a1e344328fc57b16d8631b294dc35a4b8.tar.xz core-1506e23a1e344328fc57b16d8631b294dc35a4b8.zip | |
Cleanup, sorted out distro specific stuff.
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2690 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
5 files changed, 9 insertions, 9 deletions
diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Debian.pm index 3836faf4..2f6e3f7b 100644 --- a/os-plugins/plugins/xserver/OpenSLX/Distro/Debian.pm +++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Debian.pm @@ -34,7 +34,8 @@ sub setupXserverScript my $script = $self->SUPER::setupXserverScript($repoPath); $script .= unshiftHereDoc(<<' End-of-Here'); - # debian specific extension to stage3 xserver.sh + # Debian specific extension to stage3 xserver.sh + testmkd /mnt/var/lib/xkb End-of-Here return $script; diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm index 8e00a903..7ceb704e 100644 --- a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm +++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm @@ -37,6 +37,7 @@ sub setupXserverScript $script .= unshiftHereDoc(<<' End-of-Here'); # SuSE specific extension to stage3 xserver.sh + testmkd /mnt/var/lib/xkb/compiled testmkd /mnt/var/X11R6/bin testmkd /mnt/var/lib/xdm/authdir/authfiles 0700 ln -s /usr/bin/Xorg /mnt/var/X11R6/bin/X diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10_2.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10_2.pm index 21c9a861..18d8c029 100644 --- a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10_2.pm +++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10_2.pm @@ -37,6 +37,7 @@ sub setupXserverScript $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 diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm index 162a2291..d422c589 100644 --- a/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm +++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm @@ -36,9 +36,10 @@ sub setupXserverScript $script .= unshiftHereDoc(<<' End-of-Here'); # Ubuntu specific extension to stage3 xserver.sh testmkd /mnt/var/run/xauth + testmkd /mnt/var/lib/xkb End-of-Here return $script; } -1;
\ No newline at end of file +1; diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh index 07c452f3..db411816 100644 --- a/os-plugins/plugins/xserver/XX_xserver.sh +++ b/os-plugins/plugins/xserver/XX_xserver.sh @@ -127,7 +127,7 @@ xserver plugin in OpenSLX stage3\n# DO NOT EDIT THIS FILE BUT THE PLUGIN \ INSTEAD" > $xfc echo ' Section "Files" -# ModulePath "/usr/lib/xorg/modules/,/usr/lib64/xorg/modules/" +# ModulePath "/usr/lib/xorg/modules/,/usr/lib64/xorg/modules/" EndSection Section "ServerFlags" Option "AllowMouseOpenFail" @@ -208,10 +208,6 @@ EndSection' >> $xfc sed -e '/\"XkbLayout\"/a\\ \ Option "XkbVariant" "nodeadkeys"' \ -i $xfc fi - # these directories might be distro specific - for file in /var/lib/xkb/compiled ; do - testmkd /mnt/${file} - done # if a synaptic touchpad is present, add it to the device list if grep -q -E "ynaptics" /etc/hwinfo.mouse || \ dmesg | grep -q -E "ynaptics" ; then @@ -228,9 +224,9 @@ a\ \ InputDevice\ \ "Synaptics TP"\ \ \ \ \ \ "SendCoreEvents" }' -i $xfc fi - # ModulePath for proprietary drivers + # ModulePath for proprietary drivers (otherwise disabled) if [ -n "$xserver_driver" -o "$xserver_prefnongpl" -eq "1" ]; then - sed -e "s,^# ModulePath \",ModulePath \"${MODULE_PATH},g" \ + sed -e "s,# ModulePath \",ModulePath \"${MODULE_PATH},g" \ -i $xfc fi |