diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-03-02 11:35:17 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-03-02 11:35:17 +0000 |
| commit | cf250f3743f92d56053f0dc29ef5ba5fb4056e19 (patch) | |
| tree | 6ee1ef716b25dfd130488a977357db9b2ff3f73c | |
| parent | 7b36f5f3d17d051cae7e78d7bd03f6144dcb180c (diff) | |
| download | drakx-backup-do-not-use-cf250f3743f92d56053f0dc29ef5ba5fb4056e19.tar drakx-backup-do-not-use-cf250f3743f92d56053f0dc29ef5ba5fb4056e19.tar.gz drakx-backup-do-not-use-cf250f3743f92d56053f0dc29ef5ba5fb4056e19.tar.bz2 drakx-backup-do-not-use-cf250f3743f92d56053f0dc29ef5ba5fb4056e19.tar.xz drakx-backup-do-not-use-cf250f3743f92d56053f0dc29ef5ba5fb4056e19.zip | |
handle boot-as and master-boot (bugzilla #13846)
| -rw-r--r-- | perl-install/bootloader.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 83a95f6c4..034b8b568 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1044,8 +1044,9 @@ sub write_lilo { push @entry_conf, $entry->{'read-write'} ? "read-write" : "read-only"; push @entry_conf, grep { $entry->{$_} } qw(optional); } else { - push @entry_conf, "table=$entry->{table}" if $entry->{table}; - push @entry_conf, "unsafe" if $entry->{unsafe} && !$entry->{table}; + delete $entry->{unsafe} if !$entry->{table}; #- we can't have both + push @entry_conf, map { "$_=$entry->{$_}" } grep { $entry->{$_} } qw(table boot-as); + push @entry_conf, grep { $entry->{$_} } qw(unsafe master-boot); if ($entry->{table}) { #- hum, things like table=c: are needed for some os2 cases, |