diff options
author | Thierry Vignaud <tv@mageia.org> | 2012-03-24 06:37:22 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mageia.org> | 2012-03-24 06:37:22 +0000 |
commit | ba35d85c9bb185ffff6ff51c155bc4af7c100cfa (patch) | |
tree | 716d4a8f353e12b3546b57b6ea8372845e2def28 | |
parent | dfbb404b9eca66f780fe3787a01681121feadc24 (diff) | |
download | drakx-kbd-mouse-x11-ba35d85c9bb185ffff6ff51c155bc4af7c100cfa.tar drakx-kbd-mouse-x11-ba35d85c9bb185ffff6ff51c155bc4af7c100cfa.tar.gz drakx-kbd-mouse-x11-ba35d85c9bb185ffff6ff51c155bc4af7c100cfa.tar.bz2 drakx-kbd-mouse-x11-ba35d85c9bb185ffff6ff51c155bc4af7c100cfa.tar.xz drakx-kbd-mouse-x11-ba35d85c9bb185ffff6ff51c155bc4af7c100cfa.zip |
(check_XFree) fix a very ancient bug where we would symlink xorg.conf
to nothing if xorg.conf.standard exists
(issue introduced by pixel in r242888 on Mon Jun 9 2008:
"drop support for /etc/X11/XF86Config (replaced by xorg.conf for some
time now)")
(spot by perl_checker)
-rw-r--r-- | NEWS | 2 | ||||
-rwxr-xr-x | tools/XFdrake | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -1,4 +1,6 @@ - do not run setxkbmap during text install +- do not generate a xorg.conf symlink pointing to nothing if + xorg.conf.standard exists - handle drivers needing SSE - handle drivers needing firmware (mga#1471, mga#3421) diff --git a/tools/XFdrake b/tools/XFdrake index 9805ecd..3628ff2 100755 --- a/tools/XFdrake +++ b/tools/XFdrake @@ -78,10 +78,11 @@ $configure_this ||= $::auto ? 'auto_install' : 'everything'; sub check_XFree { my ($in) = @_; + # FIXME: drop this very old useless block in mga3 #- set the standard configuration { my $f = "/etc/X11/xorg.conf"; - symlinkf("$_.standard", $f) if -l $f && -e "$f.standard"; + symlinkf("xorg.conf.standard", $f) if -l $f && -e "$f.standard"; } $in->do_pkgs->ensure_are_installed(['task-x11']) or $in->exit; |