summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-05-25 11:22:16 +0000
committerFrancois Pons <fpons@mandriva.com>2000-05-25 11:22:16 +0000
commita5cbe2370666644c7728729ba948c7a6336566b8 (patch)
treeb75de99178b83fd925a0e9e81808cf2cc11be791 /perl-install/install2.pm
parent3817c0ae5ac9d2bd27f74d62cefb1336b6088657 (diff)
downloaddrakx-a5cbe2370666644c7728729ba948c7a6336566b8.tar
drakx-a5cbe2370666644c7728729ba948c7a6336566b8.tar.gz
drakx-a5cbe2370666644c7728729ba948c7a6336566b8.tar.bz2
drakx-a5cbe2370666644c7728729ba948c7a6336566b8.tar.xz
drakx-a5cbe2370666644c7728729ba948c7a6336566b8.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm4
1 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index cfe2de197..15566d0c7 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -62,7 +62,9 @@ arch() !~ /alpha|sparc/ ? (
) : (),
setupBootloader => [ __("Install bootloader"), 1, 1, '$::o->{lnx4win} && !$::expert', "doInstallStep" ],
configureX => [ __("Configure X"), 1, 1, '', ["formatPartitions", "setupBootloader"] ],
+arch() !~ /sparc/ ? (
generateAutoInstFloppy => [ __("Auto install floppy"), 1, 1, '!$::expert || $o->{lnx4win}', "doInstallStep" ],
+) : (),
exitInstall => [ __("Exit install"), 0, 0, '$::beginner' ],
);
for (my $i = 0; $i < @installSteps; $i += 2) {
@@ -489,6 +491,8 @@ sub createBootdisk {
sub setupBootloader {
return if $::g_auto_install;
+ modules::write_conf("$o->{prefix}/etc/conf.modules");
+
$o->setupBootloaderBefore if $_[1] == 1;
$o->setupBootloader($_[1] - 1);