summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-05-23 10:43:53 +0000
committerFrancois Pons <fpons@mandriva.com>2000-05-23 10:43:53 +0000
commitbda5afa37f77b4a69a7848bfa2a558f6027e5611 (patch)
treead23a9638ba791ec8d690dcffc2c46897e37838e /perl-install/install_steps.pm
parentc15afb4a54dd6003ed89efaf6d42ef2db7eb887f (diff)
downloaddrakx-bda5afa37f77b4a69a7848bfa2a558f6027e5611.tar
drakx-bda5afa37f77b4a69a7848bfa2a558f6027e5611.tar.gz
drakx-bda5afa37f77b4a69a7848bfa2a558f6027e5611.tar.bz2
drakx-bda5afa37f77b4a69a7848bfa2a558f6027e5611.tar.xz
drakx-bda5afa37f77b4a69a7848bfa2a558f6027e5611.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm13
1 files changed, 11 insertions, 2 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index fc0c42465..c128a6980 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -335,6 +335,10 @@ Consoles 1,3,4,7 may also contain interesting information";
#- why not? cuz weather is nice today :-) [pixel]
sync(); sync();
+ #- call ldconfig at the end of package installation
+ run_program::rooted($o->{prefix}, "ldconfig");
+
+ #- configure PCMCIA services if needed.
$o->pcmciaConfig();
#- for mandrake_firstime
@@ -825,9 +829,14 @@ sub setupBootloader($) {
};
run_program::rooted($o->{prefix}, "abootconf", $b->{boot}, $b->{part_nb});
+ modules::load('loop');
output "$o->{prefix}/etc/aboot.conf",
- map_index { "$::i:$b->{part_nb}$_ root=$b->{root} $b->{perImageAppend}\n" }
- map { /$o->{prefix}(.*)/ } eval { glob_("$o->{prefix}/boot/vmlinux*") };
+ map_index { -e "$o->{prefix}/boot/initrd-$_->[1]" ?
+ "$::i:$b->{part_nb}$_->[0] root=$b->{root} initrd=/boot/initrd-$_->[1] $b->{perImageAppend}\n" :
+ "$::i:$b->{part_nb}$_->[0] root=$b->{root} $b->{perImageAppend}\n" }
+ map { run_program::rooted($o->{prefix}, "mkinitrd", "-f", "/boot/initrd-$_->[1]", "--ifneeded", $_->[1]) or
+ unlink "$o->{prefix}/boot/initrd-$_->[1]" } grep { $_->[0] && $_->[1] }
+ map { [ m|$o->{prefix}(/boot/vmlinux-(.*))| ] } eval { glob_("$o->{prefix}/boot/vmlinux-*") };
} elsif (arch() =~ /^sparc/) {
silo::install($o->{prefix}, $o->{bootloader});
} else {