summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorStew Benedict <stewb@mandriva.org>2001-05-02 18:39:44 +0000
committerStew Benedict <stewb@mandriva.org>2001-05-02 18:39:44 +0000
commit654e86804269105669a9eee0cf48aca749a17b90 (patch)
tree0524774e1971cd9253acfc883b5dd269b6187fa8 /perl-install
parent584cf85907f139e62ed27c8b84c37b4bce43c21f (diff)
downloaddrakx-654e86804269105669a9eee0cf48aca749a17b90.tar
drakx-654e86804269105669a9eee0cf48aca749a17b90.tar.gz
drakx-654e86804269105669a9eee0cf48aca749a17b90.tar.bz2
drakx-654e86804269105669a9eee0cf48aca749a17b90.tar.xz
drakx-654e86804269105669a9eee0cf48aca749a17b90.zip
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.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm1
-rw-r--r--perl-install/bootloader.pm28
-rw-r--r--perl-install/install_any.pm1
-rw-r--r--perl-install/share/themes/mdk-bg.pngbin95 -> 151 bytes
4 files changed, 16 insertions, 14 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index e2045a535..e48cb64eb 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -176,6 +176,7 @@ sub setupBootloader {
}
) or return 0;
} else {
+ $b->{boot} = $partition_table_mac::bootstrap_part;
$in->ask_from_entries_refH('', _("Bootloader main options"), [
{ label => _("Bootloader to use"), val => \$bootloader, list => [ keys(%bootloaders) ], format => \&translate },
{ label => _("Init Message"), val => \$b->{initmsg} },
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";
}
}
}
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 3190bf4ba..9e600104a 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -947,6 +947,7 @@ sub check_prog {
sub remove_bigseldom_used {
log::l("remove_bigseldom_used");
+ $::testing and return;
unlink glob_("/usr/share/gtk/themes/$_*") foreach qw(DarkMarble marble3d);
if (ref($::o) =~ /gtk/) {
unlink glob_("/lib/lib$_*") foreach qw(slang newt);
diff --git a/perl-install/share/themes/mdk-bg.png b/perl-install/share/themes/mdk-bg.png
index d749eb412..fb78e04d2 100644
--- a/perl-install/share/themes/mdk-bg.png
+++ b/perl-install/share/themes/mdk-bg.png
Binary files differ