summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-23 00:38:28 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-23 00:38:28 +0000
commit37860db32a298e81d107848c7021f39427ff2e29 (patch)
treeaca56a7afe2ac47312f7d69037dd2be7fe5da32a /perl-install/install_steps.pm
parenta2d6666a3797ac9d980855cc8a28cf9a6466a78c (diff)
downloaddrakx-37860db32a298e81d107848c7021f39427ff2e29.tar
drakx-37860db32a298e81d107848c7021f39427ff2e29.tar.gz
drakx-37860db32a298e81d107848c7021f39427ff2e29.tar.bz2
drakx-37860db32a298e81d107848c7021f39427ff2e29.tar.xz
drakx-37860db32a298e81d107848c7021f39427ff2e29.zip
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm17
1 files changed, 11 insertions, 6 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index d02e735aa..bf68f7971 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -108,16 +108,15 @@ sub doPartitionDisks($$) {
sub rebootNeeded($) {
my ($o) = @_;
log::l("Rebooting...");
- exit "true";
+ exec "true";
}
sub choosePartitionsToFormat($$) {
my ($o, $fstab) = @_;
- foreach (@$fstab) {
- $_->{toFormat} = ($_->{mntpoint} && isExt2($_) || isSwap($_)) &&
- ($_->{notFormatted} || $o->{partitioning}{autoformat});
- }
+ $_->{mntpoint} = "swap" foreach grep { isSwap($_) } @$fstab;
+ $_->{toFormat} = $_->{mntpoint} &&
+ ($_->{notFormatted} || $o->{partitioning}{autoformat}) foreach @$fstab;
}
sub formatPartitions {
@@ -281,10 +280,16 @@ sub createBootdisk($) {
}
#------------------------------------------------------------------------------
+sub setupBootloaderBefore {
+ my ($o) = @_;
+ add2hash($o->{bootloader} ||= {}, lilo::read("$o->{prefix}/etc/lilo.conf"));
+ lilo::suggest($o->{prefix}, $o->{bootloader}, $o->{hds}, $o->{fstab}, install_any::kernelVersion());
+ $o->{bootloader}{keytable} ||= keyboard::kmap($o->{keyboard});
+}
+
sub setupBootloader($) {
my ($o) = @_;
return if $::g_auto_install;
- $o->{bootloader}{keytable} = keyboard::kmap($o->{keyboard}) if $o->{bootloader}{keytable} eq "1";
lilo::install($o->{prefix}, $o->{bootloader});
}