summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-08-24 19:02:16 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-08-24 19:02:16 +0000
commit10b649b6503f47388f1548c8ba9391dd6ce0284e (patch)
tree6bc1fe238a7a28721cfd15b52946e67d236c8277 /perl-install/install_steps_interactive.pm
parented18d4ad1743445dc1c49d65b5a64a0c73510edd (diff)
downloaddrakx-10b649b6503f47388f1548c8ba9391dd6ce0284e.tar
drakx-10b649b6503f47388f1548c8ba9391dd6ce0284e.tar.gz
drakx-10b649b6503f47388f1548c8ba9391dd6ce0284e.tar.bz2
drakx-10b649b6503f47388f1548c8ba9391dd6ce0284e.tar.xz
drakx-10b649b6503f47388f1548c8ba9391dd6ce0284e.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm58
1 files changed, 34 insertions, 24 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 766220388..dca0255d0 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1,24 +1,5 @@
package install_steps_interactive;
-# heritate from this class and you'll get all made interactivity for same steps.
-# for this you need to provide
-# - ask_from_listW(o, title, messages, arrayref, default) returns one string of arrayref
-# - ask_many_from_listW(o, title, messages, arrayref, arrayref2) returns one string of arrayref
-#
-# where
-# - o is the object
-# - title is a string
-# - messages is an refarray of strings
-# - default is an optional string (default is in arrayref)
-# - arrayref is an arrayref of strings
-# - arrayref2 contains booleans telling the default state,
-#
-# ask_from_list and ask_from_list_ are wrappers around ask_from_biglist and ask_from_smalllist
-#
-# ask_from_list_ just translate arrayref before calling ask_from_list and untranslate the result
-#
-# ask_from_listW should handle differently small lists and big ones.
-
use diagnostics;
use strict;
@@ -99,13 +80,13 @@ sub rebootNeeded($) {
sub choosePartitionsToFormat($$) {
my ($o, $fstab) = @_;
+ $o->SUPER::choosePartitionsToFormat($fstab) if $o->{steps}{$o->{step}}{entered} == 1;
+
my @l = grep { $_->{mntpoint} && isExt2($_) || isSwap($_) } @$fstab;
- my @r = $o->ask_many_from_list('', _("Choose the partitions you want to format"),
- [ map { $_->{mntpoint} || type2name($_->{type}) . " ($_->{device})" } @l ],
- [ map { $_->{notFormatted} } @l ]);
+ my @r = $o->ask_many_from_list_ref('', _("Choose the partitions you want to format"),
+ [ map { $_->{mntpoint} || type2name($_->{type}) . " ($_->{device})" } @l ],
+ [ map { \$_->{toFormat} } @l ]);
defined @r or die "cancel";
- my $i = 0;
- $_->{toFormat} = $r[$i++] foreach @l;
}
sub formatPartitions {
@@ -119,6 +100,35 @@ sub formatPartitions {
}
}
+sub configureNetwork($) {
+ my ($o, $first_time) = @_;
+ my $r = '';
+
+ if ($o->{intf}) {
+ if ($first_time) {
+ my @l = (
+ __("Keep the current IP configuration"),
+ __("Reconfigure network now"),
+ __("Don't set up networking"),
+ );
+ $r = $o->ask_from_list_(_("Network Configuration"),
+ _("LAN networking has already been configured. Do you want to:"),
+ [ @l ]);
+ !$r || $r =~ /^Don't/ and return;
+ }
+ } else {
+ $o->ask_yesorno(_("Network Configuration"),
+ _("Do you want to configure LAN (not dialup) networking for your installed system?")) or return;
+ }
+
+ if ($r !~ /^Keep/) {
+ $o->configureNetworkAsk or return;
+ }
+ $o->SUPER::configureNetwork;
+}
+
+
+
sub createBootdisk($) {
my ($o) = @_;