summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfigurator.pm
diff options
context:
space:
mode:
authorStew Benedict <stewb@mandriva.org>2001-03-07 15:58:35 +0000
committerStew Benedict <stewb@mandriva.org>2001-03-07 15:58:35 +0000
commitb1d05dc7fee97d03da6b1d71e596fab012ebc371 (patch)
tree31c90d5a3574052a722dc66f8e11c9fffcdfb2ed /perl-install/Xconfigurator.pm
parent6f68ea188996d14b28460fcfb658acd8d9897cf7 (diff)
downloaddrakx-backup-do-not-use-b1d05dc7fee97d03da6b1d71e596fab012ebc371.tar
drakx-backup-do-not-use-b1d05dc7fee97d03da6b1d71e596fab012ebc371.tar.gz
drakx-backup-do-not-use-b1d05dc7fee97d03da6b1d71e596fab012ebc371.tar.bz2
drakx-backup-do-not-use-b1d05dc7fee97d03da6b1d71e596fab012ebc371.tar.xz
drakx-backup-do-not-use-b1d05dc7fee97d03da6b1d71e596fab012ebc371.zip
* perl-install/Xconfigurator.pm - force XF4 for PPC in recommended mode
* perl-install/bootloader.pm - rework get_of_dev to work in live install
Diffstat (limited to 'perl-install/Xconfigurator.pm')
-rw-r--r--perl-install/Xconfigurator.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 17e628d7a..459932c1f 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -287,7 +287,12 @@ NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.", $xf3_ver)) . "
#- in case of class discarding, this can help ...
$tc or $tc = $choices[0];
$tc->{code} and $tc->{code}();
-
+
+ #- ugly hack - force 4.0.x for PPC in recommended mode
+ if (!$::expert && arch() =~ /ppc/) {
+ $card->{use_xf4} = 1;
+ }
+
$card->{prog} = "/usr/X11R6/bin/" . ($card->{use_xf4} ? 'XFree86' : $card->{server} =~ /Sun (.*)/x ?
"Xsun$1" : "XF86_$card->{server}");