summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-21 10:56:58 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-21 10:56:58 +0000
commit4810d691da4227fe3b04ba402dd70cbdfb48d254 (patch)
tree9c17d2120d3d217460cf0316cd931995ddd92a3a
parent1c95a9572901d9caf520e78f643218ecdb8128ef (diff)
downloaddrakx-4810d691da4227fe3b04ba402dd70cbdfb48d254.tar
drakx-4810d691da4227fe3b04ba402dd70cbdfb48d254.tar.gz
drakx-4810d691da4227fe3b04ba402dd70cbdfb48d254.tar.bz2
drakx-4810d691da4227fe3b04ba402dd70cbdfb48d254.tar.xz
drakx-4810d691da4227fe3b04ba402dd70cbdfb48d254.zip
no_comment
-rw-r--r--perl-install/ChangeLog21
-rw-r--r--perl-install/Xconfigurator.pm20
-rw-r--r--perl-install/detect_devices.pm2
-rw-r--r--perl-install/install_steps_interactive.pm2
4 files changed, 39 insertions, 6 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 1bd26b921..e65f647c4 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,21 @@
+2000-09-21 Pixel <pixel@mandrakesoft.com>
+
+ * detect_devices.pm (@netdevices): plip removed in standalone,
+ otherwise plip is always there (because of kmod)
+
+ * install_steps_interactive.pm (choosePartitionsToFormat): replace
+ the die "cancel" by die "already displayed", so that no error is
+ displayed.
+
+ * pci_probing/pcitable: replace some rtl8139 by 8139too, added
+ cards DELTA8139 and ADDTRON8139 (for jeff)
+
+ * Xconfigurator.pm (show_info): also show the colordepth and
+ resolution. don't show server if none, show XF4 driver if there's
+ one.
+ (main): change the "Forget the changes" to "Keep the changes?"
+ with displaying the current configuration.
+
2000-09-21 François Pons <fpons@mandrakesoft.com>
* printer.pm: changed "PostScript" ppd default description to "Raw
@@ -13,6 +31,9 @@
* netconnect.pm (conf_network_card): added check when dhcp. Cable connection
should now work.
+2000-09-21 DrakX <install@linux-mandrake.com>
+
+ * snapshot uploaded
2000-09-21 Pixel <pixel@mandrakesoft.com>
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index ebc01134c..bea9149c2 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -995,7 +995,7 @@ sub XF86check_link {
}
}
-sub show_info {
+sub info {
my ($o) = @_;
my $info;
@@ -1007,9 +1007,18 @@ sub show_info {
$info .= _("Monitor VertRefresh: %s\n", $o->{monitor}{vsyncrange}) if $::expert;
$info .= _("Graphic card: %s\n", $o->{card}{type});
$info .= _("Graphic memory: %s kB\n", $o->{card}{memory}) if $o->{card}{memory};
- $info .= _("XFree86 server: %s\n", $o->{card}{server});
+ if ($o->{default_depth} and my $depth = $o->{card}{depth}{$o->{default_depth}}) {
+ $info .= _("Color depth: %s\n", translate($depths{$o->{default_depth}}));
+ $info .= _("Resolution: %s\n", join "x", @{$depth->[0]}) if $depth && !is_empty_array_ref($depth->[0]);
+ }
+ $info .= _("XFree86 server: %s\n", $o->{card}{server}) if $o->{card}{server};
+ $info .= _("XFree86 driver: %s\n", $o->{card}{driver}) if $o->{card}{driver};
+ $info;
+}
- $in->ask_warn('', $info);
+sub show_info {
+ my ($o) = @_;
+ $in->ask_warn('', info($o));
}
#- Program entry point.
@@ -1053,7 +1062,10 @@ sub main {
$in->kill;
}
if (!$ok) {
- $ok = !$in->ask_yesorno('', _("Forget the changes?"), 1);
+ $ok = $in->ask_yesorno('', _("Keep the changes?
+Current configuration is:
+
+%s", info($o)));
}
if ($ok) {
unless ($::testing) {
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 169acf627..be6ba24d6 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -14,7 +14,7 @@ use c;
#-#####################################################################################
#- Globals
#-#####################################################################################
-my @netdevices = map { my $l = $_; map { "$l$_" } (0..3) } qw(eth tr plip fddi);
+my @netdevices = map { my $l = $_; map { "$l$_" } (0..3) } (qw(eth tr fddi), $::isStandalone ? () : 'plip');
my %serialprobe = ();
my $usb_interface = undef;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 6a2a27791..e142d4c47 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -291,7 +291,7 @@ sub choosePartitionsToFormat($$) {
$o->ask_many_from_list_ref('', _("Choose the partitions you want to format"),
[ map { $label{$_} } @l ],
- [ map { \$toFormat{$_} } @l ]) or die "cancel";
+ [ map { \$toFormat{$_} } @l ]) or die "already displayed";
#- ok now we can really set toFormat
$_->{toFormat} = $toFormat{$_} foreach @l;