diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-09-01 07:34:02 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-09-01 07:34:02 +0000 |
| commit | 2a59a8666bb3889c9dd09efe6994ac131f2b9c30 (patch) | |
| tree | ecaa394c73b7d1004a219744e014c4668a7592a4 | |
| parent | 6ee2bb2c912ef78bc3f41227184d61cfbd9aa8bb (diff) | |
| download | drakx-2a59a8666bb3889c9dd09efe6994ac131f2b9c30.tar drakx-2a59a8666bb3889c9dd09efe6994ac131f2b9c30.tar.gz drakx-2a59a8666bb3889c9dd09efe6994ac131f2b9c30.tar.bz2 drakx-2a59a8666bb3889c9dd09efe6994ac131f2b9c30.tar.xz drakx-2a59a8666bb3889c9dd09efe6994ac131f2b9c30.zip | |
When adding a networked supplementary media, configure the network if
needed. Install basesystem for this purpose.
| -rw-r--r-- | perl-install/install_any.pm | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 2260e894c..4ed5e344d 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -413,6 +413,17 @@ sub selectSupplMedia { ? (max(map { $_->{medium} =~ /^(\d+)s$/ ? $1 : 0 } values %{$o->{packages}{mediums}}) + 1) . "s" : int(keys %{$o->{packages}{mediums}}) + 1; local $::isWizard = 0; + #- configure network if needed + if (!our $asked && !scalar keys %{$o->{intf}}) { + $asked = 1; + #- install basesystem now + $::o->do_pkgs->ensure_is_installed('basesystem', undef, 1); + #- from install_steps_interactive: + local $::expert = $::expert; + require network::netconnect; + network::netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o, $o->{modules_conf}, $o->{netc}, $o->{mouse}, $o->{intf}, 0, 1); + install_interactive::upNetwork($o); + } local $o->{method} = $suppl_method; if ($suppl_method eq 'cdrom') { (my $cdromdev) = detect_devices::cdroms(); |