diff options
| -rw-r--r-- | perl-install/install2.pm | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 2f5c3f47a..9e36510fb 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -3,8 +3,6 @@ package install2; # $Id$ use diagnostics; use strict; -use Data::Dumper; - use vars qw($o $version); #-###################################################################################### @@ -59,9 +57,6 @@ arch() !~ /alpha/ ? ( ) : (), setupBootloader => [ __("Install bootloader"), 1, 1, '', "installPackages" ], configureX => [ __("Configure X"), 1, 1, '', ["formatPartitions", "setupBootloader"] ], -arch() !~ /alpha/ ? ( - generateAutoInstFloppy => [ __("Auto install floppy"), 1, 1, '!$::expert || $o->{lnx4win}', "installPackages" ], -) : (), exitInstall => [ __("Exit install"), 0, 0, '!$::expert && !$::live' ], ); for (my $i = 0; $i < @installSteps; $i += 2) { @@ -355,9 +350,6 @@ sub configureX { $o->configureX($clicked) if pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'XFree86')) && !$o->{X}{disabled} || $clicked || $::testing; } #------------------------------------------------------------------------------ -sub generateAutoInstFloppy { $o->generateAutoInstFloppy } - -#------------------------------------------------------------------------------ sub exitInstall { $o->exitInstall(getNextStep() eq "exitInstall") } @@ -492,8 +484,6 @@ sub main { $o->{interactive} ||= 'gtk'; require"install_steps_$o->{interactive}.pm"; } - eval { $o = $::o = install_any::loadO($o, "patch") } if $patch; - eval { $o = $::o = install_any::loadO($o, $cfg) } if $cfg; $o->{prefix} = $::testing ? "/tmp/test-perl-install" : $::live ? "" : "/mnt"; mkdir $o->{prefix}, 0755; @@ -503,6 +493,10 @@ sub main { modules::read_stage1_conf($_) foreach "/tmp/conf.modules", "/etc/modules.conf"; modules::read_already_loaded(); + #- done after module dependencies are loaded for "vfat depends on fat" + eval { $o = $::o = install_any::loadO($o, "patch") } if $patch; + eval { $o = $::o = install_any::loadO($o, $cfg) } if $cfg; + eval { modules::load("af_packet") }; map_index { |