summaryrefslogtreecommitdiffstats
path: root/perl-install/install_gtk.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-02-25 13:42:00 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-02-25 13:42:00 +0000
commit816f58d65b8b71979c32c1bac0e76c671861ccb7 (patch)
treea5cc5a978313d60954394652977314c4c07f4d99 /perl-install/install_gtk.pm
parent02ffea566bf4fd9c895572fd1ab7f484bc77d739 (diff)
downloaddrakx-816f58d65b8b71979c32c1bac0e76c671861ccb7.tar
drakx-816f58d65b8b71979c32c1bac0e76c671861ccb7.tar.gz
drakx-816f58d65b8b71979c32c1bac0e76c671861ccb7.tar.bz2
drakx-816f58d65b8b71979c32c1bac0e76c671861ccb7.tar.xz
drakx-816f58d65b8b71979c32c1bac0e76c671861ccb7.zip
cleanup handling of XF4 server choice during install
Diffstat (limited to 'perl-install/install_gtk.pm')
-rw-r--r--perl-install/install_gtk.pm10
1 files changed, 3 insertions, 7 deletions
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm
index aa58371e1..54b051a35 100644
--- a/perl-install/install_gtk.pm
+++ b/perl-install/install_gtk.pm
@@ -209,21 +209,17 @@ sub init_sizes() {
#------------------------------------------------------------------------------
sub createXconf {
- my ($file, $mouse_type, $mouse_dev, $wacom_dev) = @_;
+ my ($file, $mouse_type, $mouse_dev, $wacom_dev, $Driver) = @_;
$mouse_type = 'IMPS/2' if $mouse_type eq 'ExplorerPS/2';
- devices::make("/dev/kbd") if arch() =~ /^sparc/; #- used by Xsun style server.
symlinkf(devices::make($mouse_dev), "/dev/mouse") if $mouse_dev ne 'none';
#- needed for imlib to start on 8-bit depth visual.
symlink("/tmp/stage2/etc/imrc", "/etc/imrc");
symlink("/tmp/stage2/etc/im_palette.pal", "etc/im_palette.pal");
-if (arch() =~ /^ia64/) {
- require Xconfig::card;
- my ($card) = Xconfig::card::probe();
- Xconfig::card::add_to_card__using_Cards($card, $card->{type}) if $card && $card->{type};
- output($file, sprintf(<<'END', $mouse_type, $card->{driver}));
+if ($Driver) {
+ output($file, sprintf(<<'END', $mouse_type, $Driver));
Section "Files"
FontPath "/usr/X11R6/lib/X11/fonts:unscaled"