summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-07-27 13:41:08 +0000
committerFrancois Pons <fpons@mandriva.com>2000-07-27 13:41:08 +0000
commita480fcf80e732eb137d83324b0d1efeec3b722f7 (patch)
tree0ddcc0c9d1f40c8f3e8f4c75dd7ad3db991d4e5f /perl-install/install_steps_interactive.pm
parente3adc97309fa31baedbc2b0373d7c4f858b0a788 (diff)
downloaddrakx-a480fcf80e732eb137d83324b0d1efeec3b722f7.tar
drakx-a480fcf80e732eb137d83324b0d1efeec3b722f7.tar.gz
drakx-a480fcf80e732eb137d83324b0d1efeec3b722f7.tar.bz2
drakx-a480fcf80e732eb137d83324b0d1efeec3b722f7.tar.xz
drakx-a480fcf80e732eb137d83324b0d1efeec3b722f7.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm9
1 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 612a70333..13b3558a0 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -932,11 +932,11 @@ sub setupXfree {
Xconfig::getinfoFromXF86Config($o->{X}, $o->{prefix});
}
}
- $::xf4 = $o->ask_yesorno('',
+ $::force_xf3 = $o->ask_yesorno('',
_("DrakX will generate config files for both XFree 3.3 and XFree 4.0.
-By default, the 3.3 server is used because it works on more graphic cards.
+By default, the 4.0 server is used unless your card is not supported.
-Do you want to try XFree 4.0?")) if $::expert && arch() != /sparc/;
+Do you want to keep XFree 3.3?"), 0) if $::expert;
#- strange, xfs must not be started twice...
#- trying to stop and restart it does nothing good too...
@@ -951,7 +951,8 @@ Do you want to try XFree 4.0?")) if $::expert && arch() != /sparc/;
$::noauto = $::noauto; #- no warning
Xconfigurator::main($o->{prefix}, $o->{X}, $o, $o->{allowFB}, bool($o->{pcmcia}), sub {
- $o->pkg_install("XFree86-$_[0]");
+ my ($server, @l) = @_;
+ $o->pkg_install("XFree86-$server", @l);
});
}
$o->setupXfreeAfter;