summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-03-11 10:21:50 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-03-11 10:21:50 +0000
commit93771f2b43d02f366cd7febe8c27aa6c63fcb786 (patch)
tree1bd8a2a305f4f1f14dd379edac6423e00b72f85f
parenta1d4ee26dd2eff5c4db97ad729442a61be4930f9 (diff)
downloaddrakx-backup-do-not-use-93771f2b43d02f366cd7febe8c27aa6c63fcb786.tar
drakx-backup-do-not-use-93771f2b43d02f366cd7febe8c27aa6c63fcb786.tar.gz
drakx-backup-do-not-use-93771f2b43d02f366cd7febe8c27aa6c63fcb786.tar.bz2
drakx-backup-do-not-use-93771f2b43d02f366cd7febe8c27aa6c63fcb786.tar.xz
drakx-backup-do-not-use-93771f2b43d02f366cd7febe8c27aa6c63fcb786.zip
fix Stew sucks
-rw-r--r--perl-install/bootloader.pm2
-rwxr-xr-xperl-install/standalone/drakboot2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 947d25833..06f457dd4 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -538,7 +538,7 @@ sub install_yaboot($$$) {
log::l("writing yaboot config to $f");
print F "#yaboot.conf - generated by DrakX";
- print F "init-message=\"\\n$lilo->{init-message}\\n\"" if $lilo->{init-message};
+ print F "init-message=\"\\n$lilo->{'init-message'}\\n\"" if $lilo->{'init-message'};
if ($lilo->{boot}) {
print F "boot=$lilo->{boot}";
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 4e0bdd504..e7e283c0d 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -39,7 +39,7 @@ sub lilo_choice
{
my $bootloader = arch() =~ /ppc/ ? bootloader::read('', '/etc/yaboot.conf') : bootloader::read('', '/etc/lilo.conf');
local ($_) = `detectloader`;
- $bootloader->{methods} = { lilo => 1, grub => !!/grub/i, yaboot => 1 };
+ $bootloader->{methods} = { lilo => 1, grub => !!/grub/i, if_(arch() =~ /ppc/, yaboot => 1) };
my ($all_hds) = catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) } sub { 1 };
my $fstab = [ fsedit::get_all_fstab($all_hds) ];