summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfigurator.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-11-22 01:56:47 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-11-22 01:56:47 +0000
commit3fbb4389df3ddeecd4fcd645591a3d90a47de373 (patch)
tree8f1547576b7dcbb2678e5aac7516d3e22e5169ec /perl-install/Xconfigurator.pm
parentc942786c119d41faaa03357ddeb5bea338867727 (diff)
downloaddrakx-3fbb4389df3ddeecd4fcd645591a3d90a47de373.tar
drakx-3fbb4389df3ddeecd4fcd645591a3d90a47de373.tar.gz
drakx-3fbb4389df3ddeecd4fcd645591a3d90a47de373.tar.bz2
drakx-3fbb4389df3ddeecd4fcd645591a3d90a47de373.tar.xz
drakx-3fbb4389df3ddeecd4fcd645591a3d90a47de373.zip
no_comment
Diffstat (limited to 'perl-install/Xconfigurator.pm')
-rw-r--r--perl-install/Xconfigurator.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index b7ce31282..ea988b777 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -153,18 +153,18 @@ sub cardConfiguration(;$$$) {
readCardsDB("$prefix/usr/X11R6/lib/X11/Cards");
add2hash($card, $cards{$card->{type}}) if $card->{type}; #- try to get info from given type
- $card->{type} = undef unless $card->{server}; #- bad type as we can't find the server
+ undef $card->{type} unless $card->{server}; #- bad type as we can't find the server
add2hash($card, cardConfigurationAuto()) unless $card->{server} || $noauto;
$card->{server} = 'FBDev' unless !$allowFB || $card->{server} || $card->{type} || $noauto;
$card->{type} = $in->ask_from_list('', _("Select a graphic card"), ['Unlisted', keys %cards]) unless $card->{type} || $card->{server};
- $card->{type} = undef, $card->{server} = $in->ask_from_list('', _("Choose a X server"), $allowFB ? \@allservers : \@allbutfbservers ) if $card->{type} eq "Unlisted";
+ undef $card->{type}, $card->{server} = $in->ask_from_list('', _("Choose a X server"), $allowFB ? \@allservers : \@allbutfbservers ) if $card->{type} eq "Unlisted";
add2hash($card, $cards{$card->{type}}) if $card->{type};
add2hash($card, { vendor => "Unknown", board => "Unknown" });
$card->{prog} = "/usr/X11R6/bin/XF86_$card->{server}";
- -x "$prefix$card->{prog}" or !defined $install or &$install($card->{server});
+ -x "$prefix$card->{prog}" or $install && &$install($card->{server});
-x "$prefix$card->{prog}" or die "server $card->{server} is not available (should be in $prefix$card->{prog})";
symlinkf "../..$card->{prog}", "$prefix/etc/X11/X" unless $::testing;