diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-05-25 18:45:50 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-05-25 18:45:50 +0000 |
| commit | 23c22ae05ec5203dcaf93ec4194b8ec2a5408f28 (patch) | |
| tree | f69d71a154eaf6142790d1577ff873295e08e3d9 /perl-install/install_steps.pm | |
| parent | cbcbc7ce4ce46ca523dd50da5da08a2cf3a06bce (diff) | |
| download | drakx-23c22ae05ec5203dcaf93ec4194b8ec2a5408f28.tar drakx-23c22ae05ec5203dcaf93ec4194b8ec2a5408f28.tar.gz drakx-23c22ae05ec5203dcaf93ec4194b8ec2a5408f28.tar.bz2 drakx-23c22ae05ec5203dcaf93ec4194b8ec2a5408f28.tar.xz drakx-23c22ae05ec5203dcaf93ec4194b8ec2a5408f28.zip | |
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps.pm')
| -rw-r--r-- | perl-install/install_steps.pm | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 9020b47ab..8c4d5d2d2 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -782,7 +782,17 @@ sub readBootloaderConfigBeforeInstall { 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; + my $e; + + if (arch() =~ /sparc/) { + require silo; + $e = silo::get("/boot/$image", $o->{bootloader}); + } else { + require lilo; + $e = lilo::get("/boot/$image", $o->{bootloader}); + } + + $e or next; $e->{kernel_or_dev} = $v; log::l("renaming /boot/$image entry by $v"); } @@ -912,7 +922,7 @@ sub miscellaneous { $o->{security} ||= $s{SECURITY} if exists $s{SECURITY}; $ENV{SECURE_LEVEL} = $o->{security}; - add2hash_ $o, { useSupermount => $o->{security} < 4 && $o->{installClass} !~ /corporate|server/ }; + add2hash_ $o, { useSupermount => $o->{security} < 4 && arch() !~ /sparc/ && $o->{installClass} !~ /corporate|server/ }; cat_("/proc/cmdline") =~ /mem=(\S+)/; add2hash_($o->{miscellaneous} ||= {}, { numlock => !$o->{pcmcia}, $1 ? (memsize => $1) : () }); |