summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-08-31 16:49:50 +0000
committerFrancois Pons <fpons@mandriva.com>2001-08-31 16:49:50 +0000
commit028c324fcef83f738d7fc5b5ddea0fedc0ef0f27 (patch)
tree95983137b4a81b7297b7497117e74d9c290470ec /perl-install
parent37ccb25e7fb0131d0275edf0f4446e0d832a6d9d (diff)
downloaddrakx-028c324fcef83f738d7fc5b5ddea0fedc0ef0f27.tar
drakx-028c324fcef83f738d7fc5b5ddea0fedc0ef0f27.tar.gz
drakx-028c324fcef83f738d7fc5b5ddea0fedc0ef0f27.tar.bz2
drakx-028c324fcef83f738d7fc5b5ddea0fedc0ef0f27.tar.xz
drakx-028c324fcef83f738d7fc5b5ddea0fedc0ef0f27.zip
add option --allow-medium-change to force asking question even if --auto is
given on command line of urpmi, for installing package so that a dialog appears.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/standalone.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index 09d49e5b6..8f3c641bb 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -22,7 +22,7 @@ sub interactive::do_pkgs {
sub install {
my ($o, @l) = @_;
$o->{in}->suspend;
- my $ret = system('urpmi', '--auto', '--best-output', @l) == 0;
+ my $ret = system('urpmi', '--allow-medium-change', '--auto', '--best-output', @l) == 0;
$o->{in}->resume;
$ret;
}
>>>> 1.300
2000-10-03 DrakX <install@linux-mandrake.com>
* snapshot uploaded
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index f594969f1..0d2968bda 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -415,7 +415,7 @@ sub testFinalConfig {
#- needed for bad cards not restoring cleanly framebuffer
my $bad_card = $o->{card}{identifier} =~ /i740|ViRGE/;
- $bad_card ||= $o->{card}{identifier} =~ /Rage Mobility (?:P\/M|L) / || $o->{card}{identifier} =~ /3D Rage (?:LT|Pro)/;
+ $bad_card ||= $o->{card}{identifier} =~ /Rage Mobility (?:P\/M|L) / || $o->{card}{identifier} =~ /3D Rage LT)/;
$bad_card ||= $o->{card}{use_xf4}; #- TODO obsoleted to check, when using fbdev of XFree 4.0!
log::l("the graphic card does not like X in framebuffer") if $bad_card;