From 654e86804269105669a9eee0cf48aca749a17b90 Mon Sep 17 00:00:00 2001 From: Stew Benedict Date: Wed, 2 May 2001 18:39:44 +0000 Subject: Don't delete any images in test mode. Fix tabs in bootloader.pm. Default bootstrap partition in expert. Change mdk-bg.png to 4x4 for PPC strangeness. --- perl-install/bootloader.pm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'perl-install/bootloader.pm') diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 0184ce10d..6aec18420 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -468,14 +468,14 @@ sub install_yaboot($$$) { log::l("writing yaboot config to $f"); print F "#yaboot.conf - generated by DrakX"; - print F "init-message=\"\\n$lilo->{initmsg}\\n\"" if $lilo->{initmsg}; + print F "init-message=\"\\n$lilo->{initmsg}\\n\"" if $lilo->{initmsg}; if ($lilo->{boot}) { - print F "boot=$lilo->{boot}"; - my $of_dev = get_of_dev($prefix, $lilo->{boot}); + print F "boot=$lilo->{boot}"; + my $of_dev = get_of_dev($prefix, $lilo->{boot}); print F "ofboot=$of_dev"; } else { - die "no bootstrap partition defined." + die "no bootstrap partition defined." } $lilo->{$_} and print F "$_=$lilo->{$_}" foreach qw(delay timeout); @@ -488,17 +488,17 @@ sub install_yaboot($$$) { foreach (@{$lilo->{entries}}) { if ($_->{type} eq "image") { - my $of_dev = get_of_dev($prefix, $_->{root}); - print F "$_->{type}=$of_dev,$_->{kernel_or_dev}"; - print F "\tlabel=", substr($_->{label}, 0, 15); #- lilo doesn't handle more than 15 char long labels - print F "\troot=$_->{root}"; - print F "\tinitrd=$of_dev,$_->{initrd}" if $_->{initrd}; - print F "\tappend=\"$_->{append}\"" if $_->{append}; - print F "\tread-write" if $_->{'read-write'}; - print F "\tread-only" if !$_->{'read-write'}; + my $of_dev = get_of_dev($prefix, $_->{root}); + print F "$_->{type}=$of_dev,$_->{kernel_or_dev}"; + print F "\tlabel=", substr($_->{label}, 0, 15); #- lilo doesn't handle more than 15 char long labels + print F "\troot=$_->{root}"; + print F "\tinitrd=$of_dev,$_->{initrd}" if $_->{initrd}; + print F "\tappend=\"$_->{append}\"" if $_->{append}; + print F "\tread-write" if $_->{'read-write'}; + print F "\tread-only" if !$_->{'read-write'}; } else { - my $of_dev = get_of_dev($prefix, $_->{kernel_or_dev}); - print F "$_->{label}=$of_dev"; + my $of_dev = get_of_dev($prefix, $_->{kernel_or_dev}); + print F "$_->{label}=$of_dev"; } } } -- cgit v1.2.1