diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2006-01-18 11:44:39 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2006-01-18 11:44:39 +0000 |
| commit | 6ea1d67de90418b865429936486fab7312898cfe (patch) | |
| tree | 12bf304b3f82108cf7acde4e2f89b8a6f1455cd6 | |
| parent | 81e56d63ebae2009dec2336065e21bc178faa628 (diff) | |
| download | drakx-6ea1d67de90418b865429936486fab7312898cfe.tar drakx-6ea1d67de90418b865429936486fab7312898cfe.tar.gz drakx-6ea1d67de90418b865429936486fab7312898cfe.tar.bz2 drakx-6ea1d67de90418b865429936486fab7312898cfe.tar.xz drakx-6ea1d67de90418b865429936486fab7312898cfe.zip | |
- read all per entry entries (esp. makeactive)
- write makeactive
- have makeactive for windows entries (bugzilla #20081)
| -rw-r--r-- | perl-install/bootloader.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index ff5efabed..348c3972e 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -250,6 +250,8 @@ sub read_grub_menu_lst { $e->{mapdrive}{$2} = $1 if $v =~ m/\((.*)\) \((.*)\)/; } elsif ($keyword eq 'module') { push @{$e->{modules}}, $v; + } else { + $e->{$keyword} = $v eq '' ? 1 : $v; } } } @@ -863,7 +865,8 @@ sub suggest { type => 'other', kernel_or_dev => "/dev/$_->{device}", label => 'windows' . ($::i || ''), - table => "/dev/$_->{rootDevice}" + table => "/dev/$_->{rootDevice}", + makeactive => 1, }); } @windows_boot_parts; } @@ -1407,8 +1410,8 @@ sub write_grub { } if ($_->{mapdrive}) { push @conf, map_each { "map ($::b) ($::a)" } %{$_->{mapdrive}}; - push @conf, "makeactive"; } + push @conf, "makeactive" if $_->{makeactive}; push @conf, "chainloader +1"; } } |