summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/Xconfig/main.pm2
-rw-r--r--lib/Xconfig/test.pm2
-rw-r--r--lib/Xconfig/various.pm10
-rwxr-xr-xtools/XFdrake4
4 files changed, 9 insertions, 9 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;
}
}
diff --git a/tools/XFdrake b/tools/XFdrake
index e9e2b61..9805ecd 100755
--- a/tools/XFdrake
+++ b/tools/XFdrake
@@ -79,8 +79,8 @@ sub check_XFree {
my ($in) = @_;
#- set the standard configuration
- foreach ('XF86Config', 'XF86Config-4') {
- my $f = "/etc/X11/$_";
+ {
+ my $f = "/etc/X11/xorg.conf";
symlinkf("$_.standard", $f) if -l $f && -e "$f.standard";
}