diff options
| author | damien <damien@mandriva.com> | 2001-03-05 22:34:04 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2001-03-05 22:34:04 +0000 |
| commit | 62c2b5b104b979eb453b5e6886d80ae8459fb2a6 (patch) | |
| tree | f802d48331e9df71d262db61130d6cd9ef43df93 /perl-install | |
| parent | 599f71d744cba848ae79d5fc96d3bde06cf5665a (diff) | |
| download | drakx-62c2b5b104b979eb453b5e6886d80ae8459fb2a6.tar drakx-62c2b5b104b979eb453b5e6886d80ae8459fb2a6.tar.gz drakx-62c2b5b104b979eb453b5e6886d80ae8459fb2a6.tar.bz2 drakx-62c2b5b104b979eb453b5e6886d80ae8459fb2a6.tar.xz drakx-62c2b5b104b979eb453b5e6886d80ae8459fb2a6.zip | |
moved askrootpasswd and adduser before network conf
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install2.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index db7e73f73..0e219239b 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -46,12 +46,12 @@ my (%installSteps, @orderedInstallSteps); formatPartitions => [ __("Format partitions"), 1, -1, '', "doPartitionDisks" ], choosePackages => [ __("Choose packages to install"), 1, -2, '!$::expert', "formatPartitions" ], installPackages => [ __("Install system"), 1, -1, '', ["formatPartitions", "selectInstallClass"] ], + setRootPassword => [ __("Set root password"), 1, 1, '', "installPackages" ], + addUser => [ __("Add a user"), 1, 1, '', "installPackages" ], configureNetwork => [ __("Configure networking"), 1, 1, '', "formatPartitions" ], #- installCrypto => [ __("Cryptographic"), 1, 1, '!$::expert', "configureNetwork" ], summary => [ __("Summary"), 1, 0, '', "installPackages" ], configureServices => [ __("Configure services"), 1, 1, '!$::expert', "installPackages" ], - setRootPassword => [ __("Set root password"), 1, 1, '', "installPackages" ], - addUser => [ __("Add a user"), 1, 1, '', "installPackages" ], ((arch() !~ /alpha/) && (arch() !~ /ppc/)) ? ( createBootdisk => [ __("Create a bootdisk"), 1, 0, '', "installPackages" ], ) : (), @@ -547,6 +547,10 @@ sub main { my $l = network::read_interface_conf($file); add2hash(network::findIntf($o->{intf} ||= {}, $l->{DEVICE}), $l); } + if (my ($file) = glob_('/etc/resolv.conf')) { + log::l("found network config file $file"); + add2hash($o->{netc}, network::read_resolv_conf($file)); + } } #-the main cycle |