summaryrefslogtreecommitdiffstats
path: root/lib/Xconfig
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-06-09 14:46:03 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-06-09 14:46:03 +0000
commit68cf8e5fb687a00e6dca5ba271c77f94bca4a569 (patch)
tree46c272e405c728cf7b8238b71c37a9f0e27b2f92 /lib/Xconfig
parent990739f5d662b49f433c76bbd5558b1a8fa0c962 (diff)
downloaddrakx-kbd-mouse-x11-68cf8e5fb687a00e6dca5ba271c77f94bca4a569.tar
drakx-kbd-mouse-x11-68cf8e5fb687a00e6dca5ba271c77f94bca4a569.tar.gz
drakx-kbd-mouse-x11-68cf8e5fb687a00e6dca5ba271c77f94bca4a569.tar.bz2
drakx-kbd-mouse-x11-68cf8e5fb687a00e6dca5ba271c77f94bca4a569.tar.xz
drakx-kbd-mouse-x11-68cf8e5fb687a00e6dca5ba271c77f94bca4a569.zip
o drop support for /etc/X11/XF86Config (replaced by xorg.conf for some time now)
Diffstat (limited to 'lib/Xconfig')
-rw-r--r--lib/Xconfig/main.pm2
-rw-r--r--lib/Xconfig/test.pm2
-rw-r--r--lib/Xconfig/various.pm10
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/Xconfig/main.pm b/lib/Xconfig/main.pm
index 14857c7..fe8e86a 100644
--- a/lib/Xconfig/main.pm
+++ b/lib/Xconfig/main.pm
@@ -207,7 +207,7 @@ sub write {
export_to_install_X($X) if $::isInstall;
my $only_resolution = $raw_X->is_only_resolution_modified;
$raw_X->write;
- Xconfig::various::check_XF86Config_symlink();
+ Xconfig::various::check_xorg_conf_symlink();
if ($X->{resolutions}[0]{bios}) {
Xconfig::various::setupFB($X->{resolutions}[0]{bios});
'need_reboot';
diff --git a/lib/Xconfig/test.pm b/lib/Xconfig/test.pm
index bdcfeb9..a8ce68a 100644
--- a/lib/Xconfig/test.pm
+++ b/lib/Xconfig/test.pm
@@ -43,7 +43,7 @@ sub test {
symlinkf "$::prefix/tmp/.X11-unix", "/tmp/.X11-unix" if $::prefix;
}
- my $f = $::testing ? $tmpconfig : "/etc/X11/XF86Config.test";
+ my $f = $::testing ? $tmpconfig : "/etc/X11/xorg.conf.test";
$raw_X->write("$::prefix/$f");
my $f_err = common::secured_file($::prefix . ($ENV{TMPDIR} || "$ENV{HOME}/tmp") . '/.drakx.Xoutput');
diff --git a/lib/Xconfig/various.pm b/lib/Xconfig/various.pm
index 1ba652e..d6aff9d 100644
--- a/lib/Xconfig/various.pm
+++ b/lib/Xconfig/various.pm
@@ -296,9 +296,9 @@ sub configure_FB_TVOUT {
my $Screen = $raw_X->get_default_screen;
$Screen->{Display} = [ map { { l => { Depth => { val => $_ } } } } 8, 16 ];
- $raw_X->write("$::prefix/etc/X11/XF86Config.tvout");
+ $raw_X->write("$::prefix/etc/X11/xorg.conf.tvout");
- check_XF86Config_symlink();
+ check_xorg_conf_symlink();
{
require bootloader;
@@ -314,11 +314,11 @@ sub configure_FB_TVOUT {
}
}
-sub check_XF86Config_symlink() {
- my $f = "$::prefix/etc/X11/XF86Config";
+sub check_xorg_conf_symlink() {
+ my $f = "$::prefix/etc/X11/xorg.conf";
if (!-l $f && -e "$f.tvout") {
rename $f, "$f.standard";
- symlink "XF86Config.standard", $f;
+ symlink "xorg.conf.standard", $f;
}
}