summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-03-25 21:49:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-03-25 21:49:26 +0000
commit18fb55671bbe54db5316e309b88fbbe9b9cf2a95 (patch)
treecae392d06d5a0985c642ee45484caef11ac86bd3 /perl-install/install_steps.pm
parent0f3c576319ecf8ee27b7adfbf805ca1f93fd8fca (diff)
downloaddrakx-backup-do-not-use-18fb55671bbe54db5316e309b88fbbe9b9cf2a95.tar
drakx-backup-do-not-use-18fb55671bbe54db5316e309b88fbbe9b9cf2a95.tar.gz
drakx-backup-do-not-use-18fb55671bbe54db5316e309b88fbbe9b9cf2a95.tar.bz2
drakx-backup-do-not-use-18fb55671bbe54db5316e309b88fbbe9b9cf2a95.tar.xz
drakx-backup-do-not-use-18fb55671bbe54db5316e309b88fbbe9b9cf2a95.zip
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm31
1 files changed, 18 insertions, 13 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 6ba76b965..ab9c4ab24 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -262,6 +262,9 @@ Consoles 1,3,4,7 may also contain interesting information";
$o->pcmciaConfig();
+ #- for mandrake_firstime
+ output "$o->{prefix}/var/lock/TMP_1ST", "";
+
#- remove the nasty acon...
run_program::rooted($o->{prefix}, "chkconfig", "--del", "acon") unless $ENV{LANGUAGE} =~ /ar/;
@@ -612,15 +615,13 @@ sub readBootloaderConfigBeforeInstall {
#- change the /boot/vmlinuz or /boot/vmlinuz-smp entries to follow symlink.
foreach $image (keys %ofpkgs) {
- if ($o->{bootloader}{entries}{"/boot/$image"} && pkgs::packageFlagSelected($ofpkgs{$image})) {
- $v = readlink "$o->{prefix}/boot/$image";
- if ($v) {
- $v = "/boot/$v" if $v !~ m|^/|;
- if (-e "$o->{prefix}$v") {
- $o->{bootloader}{entries}{$v} = $o->{bootloader}{entries}{"/boot/$image"};
- delete $o->{bootloader}{entries}{"/boot/$image"};
- log::l("renaming /boot/$image entry by $v");
- }
+ pkgs::packageFlagSelected($ofpkgs{$image}) or next;
+ if (my $v = readlink "$o->{prefix}/boot/$image") {
+ $v = "/boot/$v" if $v !~ m|^/|;
+ if (-e "$o->{prefix}$v") {
+ my $e = lilo::get("/boot/$image", $o->{bootloader}) or next;
+ $e->{kernel} = $v;
+ log::l("renaming /boot/$image entry by $v");
}
}
}
@@ -640,6 +641,7 @@ sub setupBootloaderBefore {
} else {
require lilo;
lilo::suggest($o->{prefix}, $o->{bootloader}, $o->{hds}, $o->{fstab}, install_any::kernelVersion());
+ lilo::suggest_floppy($o->{bootloader}) if $o->{security} <= 3;
$o->{bootloader}{keytable} ||= keyboard::keyboard2kmap($o->{keyboard});
}
}
@@ -664,8 +666,8 @@ sub setupBootloader($) {
} else {
eval { lilo::install($o->{prefix}, $o->{bootloader}, $o->{fstab}) };
my $err = $@;
- eval { lilo::install_grub($o->{prefix}, $o->{bootloader}, $o->{fstab}) };
- die if $err;
+ eval { lilo::install_grub($o->{prefix}, $o->{bootloader}, $o->{fstab}, $o->{hds}) };
+ die $err if $err;
}
}
@@ -745,11 +747,14 @@ sub miscellaneous {
if (my @l = detect_devices::getIDEBurners() and !/ide-scsi/) {
$_ .= " " . join(" ", map { "$_=ide-scsi" } @l);
}
- #- keep some given parameters
if (my $m = modules::get_options("ide-mod")) {
- /options="(.*)"/ and $_ .= " $1" if !/ide.=/;
+ $m =~ /options="(.*)"/ and $_ .= " $1" if !/ide.=/;
}
+ #- keep some given parameters
+ #-TODO
+
+ log::l("perImageAppend: $_");
$o->{bootloader}{perImageAppend} = $_;
}