summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-15 18:47:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-15 18:47:12 +0000
commit9fb1eafd99a675eef35331ae3f4aee1448d7de77 (patch)
tree1ccd2fed1e80ce23d543b55f0195ab610563df00
parent5dd25e576d6ac8152e44075dfdb229e1337adf14 (diff)
downloaddrakx-9fb1eafd99a675eef35331ae3f4aee1448d7de77.tar
drakx-9fb1eafd99a675eef35331ae3f4aee1448d7de77.tar.gz
drakx-9fb1eafd99a675eef35331ae3f4aee1448d7de77.tar.bz2
drakx-9fb1eafd99a675eef35331ae3f4aee1448d7de77.tar.xz
drakx-9fb1eafd99a675eef35331ae3f4aee1448d7de77.zip
andre@node1583e.a2000.nl says this is not needed anymore :)
-rw-r--r--perl-install/Xconfigurator.pm6
-rw-r--r--perl-install/Xconfigurator_consts.pm2
2 files changed, 2 insertions, 6 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 257ad8560..7c03d719a 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -2,7 +2,7 @@ package Xconfigurator; # $Id$
use diagnostics;
use strict;
-use vars qw($in $install @window_managers @depths @monitorSize2resolution @hsyncranges %min_hsync4wres @vsyncranges %depths @resolutions %serversdriver @svgaservers @accelservers @allbutfbservers @allservers %vgamodes %videomemory @ramdac_name @ramdac_id @clockchip_name @clockchip_id %keymap_translate %standard_monitors $XF86firstchunk_text $XF86firstchunk_text2 $keyboardsection_start $keyboardsection_start_v4 $keyboardsection_part2 $keyboardsection_part3 $keyboardsection_part3_v4 $keyboardsection_end $pointersection_text $pointersection_text_v4 $monitorsection_text1 $monitorsection_text2 $monitorsection_text3 $monitorsection_text4 $modelines_text_Trident_TG_96xx $modelines_text $devicesection_text $devicesection_text_v4 $screensection_text1 %lines @options %xkb_options $good_default_monitor $low_default_monitor $layoutsection_v4);
+use vars qw($in $install @window_managers @depths @monitorSize2resolution @hsyncranges %min_hsync4wres @vsyncranges %depths @resolutions %serversdriver @svgaservers @accelservers @allbutfbservers @allservers %vgamodes %videomemory @ramdac_name @ramdac_id @clockchip_name @clockchip_id %keymap_translate %standard_monitors $XF86firstchunk_text $keyboardsection_start $keyboardsection_start_v4 $keyboardsection_part2 $keyboardsection_part3 $keyboardsection_part3_v4 $keyboardsection_end $pointersection_text $pointersection_text_v4 $monitorsection_text1 $monitorsection_text2 $monitorsection_text3 $monitorsection_text4 $modelines_text_Trident_TG_96xx $modelines_text $devicesection_text $devicesection_text_v4 $screensection_text1 %lines @options %xkb_options $good_default_monitor $low_default_monitor $layoutsection_v4);
use common qw(:common :file :functional :system);
use log;
@@ -760,10 +760,8 @@ sub write_XF86Config {
open F, ">$file" or die "can't write XF86Config in $file: $!";
open G, ">$file-4" or die "can't write XF86Config in $file-4: $!";
- print F $XF86firstchunk_text, $XF86firstchunk_text2;
+ print F $XF86firstchunk_text;
print G $XF86firstchunk_text;
- print G qq( Option "Pixmap" "24"\n) if $o->{card}{type} eq "SiS 6326";
- print G $XF86firstchunk_text2;
#- Write keyboard section.
$O = $o->{keyboard};
diff --git a/perl-install/Xconfigurator_consts.pm b/perl-install/Xconfigurator_consts.pm
index 43c063feb..918f1d415 100644
--- a/perl-install/Xconfigurator_consts.pm
+++ b/perl-install/Xconfigurator_consts.pm
@@ -402,9 +402,7 @@ Section "ServerFlags"
# This allows the server to start up even if the
# mouse device can't be opened/initialised.
AllowMouseOpenFail
-);
-$XF86firstchunk_text2 = q(
EndSection
# **********************************************************************