summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-03-23 19:06:37 +0000
committerFrancois Pons <fpons@mandriva.com>2001-03-23 19:06:37 +0000
commit45e2c4a8a65a60291e176a5606707216fb8a3490 (patch)
tree70926df2a989a90f758341dcf4ff4542203f3658
parent09c235e4fe8b1c458aca0420574fdc5a8086e6e1 (diff)
downloaddrakx-45e2c4a8a65a60291e176a5606707216fb8a3490.tar
drakx-45e2c4a8a65a60291e176a5606707216fb8a3490.tar.gz
drakx-45e2c4a8a65a60291e176a5606707216fb8a3490.tar.bz2
drakx-45e2c4a8a65a60291e176a5606707216fb8a3490.tar.xz
drakx-45e2c4a8a65a60291e176a5606707216fb8a3490.zip
fixed screen id for Device to be present whenever the same BusID is used.
-rw-r--r--perl-install/Xconfigurator.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index ab185daf4..8c37dce50 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -176,7 +176,6 @@ sub cardConfigurationAuto() {
foreach (1..$dup) {
my $card = {};
add2hash($card, $orig);
- $card->{screen} = $_ - 1;
push @result, $card;
}
@result;
@@ -221,6 +220,11 @@ sub cardConfiguration(;$$$) {
log::l("found card \"$_->{identifier}\" not supported by XF4, disabling mutli-head support");
$configure_multi_head = undef;
}
+ #- if more than one card use the same BusID, we have to use screen.
+ if ($single_heads{$_->{busid}}) {
+ $single_heads{$_->{busid}}{screen} ||= 0;
+ $_->{screen} = $single_heads{$_->{busid}}{screen} + 1;
+ }
$single_heads{$_->{busid}} = $_;
}
if ($configure_multi_head) {