summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/common.pm5
-rw-r--r--perl-install/install_steps_interactive.pm4
-rw-r--r--perl-install/partition_table_raw.pm5
-rwxr-xr-xupdate_kernel2
4 files changed, 10 insertions, 6 deletions
diff --git a/perl-install/common.pm b/perl-install/common.pm
index 279307e85..7bd373162 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -6,7 +6,7 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK $printable_chars $sizeof_int $bitof_int
@ISA = qw(Exporter);
%EXPORT_TAGS = (
- common => [ qw(__ min max sqr sum sign product bool listlength bool2text to_int to_float ikeys member divide is_empty_array_ref is_empty_hash_ref add2hash set_new set_add round round_up round_down first second top uniq translate untranslate warp_text formatAlaTeX) ],
+ common => [ qw(__ min max sqr sum sign product bool listlength bool2text to_int to_float ikeys member divide is_empty_array_ref is_empty_hash_ref add2hash add2hash_ set_new set_add round round_up round_down first second top uniq translate untranslate warp_text formatAlaTeX) ],
functional => [ qw(fold_left map_index map_tab_hash mapn mapn_ difference2 before_leaving catch_cdie cdie) ],
file => [ qw(dirname basename touch all glob_ cat_ chop_ mode) ],
system => [ qw(sync makedev unmakedev psizeof strcpy gettimeofday syscall_ crypt_ getVarsFromSh setVarsInSh) ],
@@ -50,7 +50,8 @@ sub uniq { my %l; @l{@_} = (); keys %l }
sub to_int { $_[0] =~ /(\d*)/; $1 }
sub to_float { $_[0] =~ /(\d*(\.\d*)?)/; $1 }
sub ikeys { my %l = @_; sort { $a <=> $b } keys %l }
-sub add2hash { my ($a, $b) = @_; while (my ($k, $v) = each %{$b || {}}) { $a->{$k} ||= $v } }
+sub add2hash { my ($a, $b) = @_; while (my ($k, $v) = each %{$b || {}}) { $a->{$k} ||= $v } }
+sub add2hash_ { my ($a, $b) = @_; while (my ($k, $v) = each %{$b || {}}) { exists $a->{$k} or $a->{$k} = $v } }
sub member { my $e = shift; foreach (@_) { $e eq $_ and return 1 } 0 }
sub dirname { @_ == 1 or die "usage: dirname <name>\n"; local $_ = shift; s|[^/]*/*\s*$||; s|(.)/*$|$1|; $_ || '.' }
sub basename { @_ == 1 or die "usage: basename <name>\n"; local $_ = shift; s|/*\s*$||; s|.*/||; $_ }
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index e55b866ed..f57a0f152 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -534,12 +534,14 @@ sub setupBootloader($) {
my ($o) = @_;
my @l = (__("First sector of drive"), __("First sector of boot partition"));
+ add2hash_($o->{bootloader}, { onmbr => lilo::suggest_onmbr($o->{hds}) });
+
$o->{bootloader}{onmbr} =
$o->ask_from_list_(_("Lilo Installation"),
_("Where do you want to install the bootloader?"),
\@l,
$l[!$o->{bootloader}{onmbr}]
- ) eq $l[0];
+ ) eq $l[0] unless $::beginner && $o->{bootloader}{onmbr};
lilo::proposition($o->{hds}, $o->{fstab}, $o->{bootloader});
diff --git a/perl-install/partition_table_raw.pm b/perl-install/partition_table_raw.pm
index 2cc83259f..d10d66fc3 100644
--- a/perl-install/partition_table_raw.pm
+++ b/perl-install/partition_table_raw.pm
@@ -15,8 +15,9 @@ my $nb_primary = 4;
my $offset = $common::SECTORSIZE - length($magic) - $nb_primary * common::psizeof($format);
my @MBR_signatures = (
- [ 'LILO', 0x6, "LILO" ],
- [ 'DOS', 0xa0, "\x25\x03\x4E\x02\xCD\x13" ],
+ [ 'empty', 0, "\0\0\0\0" ],
+ [ 'lilo', 0x6, "LILO" ],
+ [ 'dos', 0xa0, "\x25\x03\x4E\x02\xCD\x13" ],
);
sub compute_CHS($$) {
diff --git a/update_kernel b/update_kernel
index d377d5259..3bc23f36e 100755
--- a/update_kernel
+++ b/update_kernel
@@ -1,7 +1,7 @@
#!/bin/bash
KERNEL_VERSION="*BOOT"
-KERNEL_VERSION="2.2.13-BOOTchmou2"
+KERNEL_VERSION="2.2.13BOOTchmou5"
SCSI_DRIVERS="
53c7,8xx.o AM53C974.o BusLogic.o NCR53c406a.o advansys.o aha152x.o