diff options
Diffstat (limited to 'perl-install/install2.pm')
| -rw-r--r-- | perl-install/install2.pm | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 17bd8f1b1..90b8d8b2d 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -100,15 +100,15 @@ appropriate to you."), my @installStepsFields = qw(text redoable onError needs); my @installSteps = ( - selectLanguage => [ __("Choose your language"), 1, 1 ], - selectPath => [ __("Choose install or upgrade"), 0, 0 ], - selectInstallClass => [ __("Select installation class"), 1, 1, "selectPath" ], - setupSCSI => [ __("Setup SCSI"), 1, 0 ], - partitionDisks => [ __("Setup filesystems"), 1, 0 ], - formatPartitions => [ __("Format partitions"), 1, -1, "partitionDisks" ], - choosePackages => [ __("Choose packages to install"), 1, 1, "selectInstallClass" ], - doInstallStep => [ __("Install system"), 1, -1, ["formatPartitions", "selectPath"] ], -# configureMouse => [ __("Configure mouse"), 0, 0 ], +# selectLanguage => [ __("Choose your language"), 1, 1 ], +# selectPath => [ __("Choose install or upgrade"), 0, 0 ], +# selectInstallClass => [ __("Select installation class"), 1, 1, "selectPath" ], +# setupSCSI => [ __("Setup SCSI"), 1, 0 ], +# partitionDisks => [ __("Setup filesystems"), 1, 0 ], +# formatPartitions => [ __("Format partitions"), 1, -1, "partitionDisks" ], +# choosePackages => [ __("Choose packages to install"), 1, 1, "selectInstallClass" ], +# doInstallStep => [ __("Install system"), 1, -1, ["formatPartitions", "selectPath"] ], +## configureMouse => [ __("Configure mouse"), 0, 0 ], configureNetwork => [ __("Configure networking"), 1, 1, "formatPartitions" ], # configureTimezone => [ __("Configure timezone"), 0, 0 ], # configureServices => [ __("Configure services"), 0, 0 ], @@ -249,7 +249,8 @@ sub formatPartitions { fs::mount_all([ grep { isExt2($_) || isSwap($_) } @{$o->{fstab}} ], $o->{prefix}); - mkdir "$o->{prefix}/$_", 0755 foreach qw(dev etc home mnt tmp var var/tmp var/lib var/lib/rpm); + mkdir "$o->{prefix}/$_", 0755 foreach qw(dev etc etc/sysconfig etc/sysconfig/network-scripts + home mnt tmp var var/tmp var/lib var/lib/rpm); network::add2hosts("$o->{prefix}/etc/hosts", "127.0.0.1", "localhost.localdomain"); pkgs::init_db($o->{prefix}, $o->{isUpgrade}); } @@ -330,7 +331,8 @@ sub main { $o = install_steps_graphical->new($o); - $o->{netc} = network::read_conf("/tmp/network"); + # all information is put in {intf}, but don't let network be aware of this :) + $o->{intf} = network::read_conf("/tmp/network"); if (my ($file) = glob_('/tmp/ifcfg-*')) { log::l("found network config file $file"); $o->{intf} = network::read_interface_conf($file); |