diff options
| author | Thierry Vignaud <tv@mageia.org> | 2013-04-05 11:34:00 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2013-04-05 11:34:00 +0000 |
| commit | 3e2cb0ee651d8788bf72488766819f675fa5734f (patch) | |
| tree | 0c34848a505ff45341715e69e482a11fdc105e30 | |
| parent | 7625287416073a669b3f7d4a8836a4bcdaf0d563 (diff) | |
| download | drakx-3e2cb0ee651d8788bf72488766819f675fa5734f.tar drakx-3e2cb0ee651d8788bf72488766819f675fa5734f.tar.gz drakx-3e2cb0ee651d8788bf72488766819f675fa5734f.tar.bz2 drakx-3e2cb0ee651d8788bf72488766819f675fa5734f.tar.xz drakx-3e2cb0ee651d8788bf72488766819f675fa5734f.zip | |
set entries type when reading back grub2 conf
thus fixing switching back to grub-legacy (mga#9563)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 1 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 8e51bd46b..324a87498 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,6 +1,8 @@ - drakboot: o assume grub2.cfg is UTF-8 encoded o read back xen conf from grub2 + o set entries type when reading back grub2 conf, thus fixing + switching back to grub-legacy (mga#9563) - draksound o update draksound troubleshooting text (mga#4162) diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 461f94760..d8146905d 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -245,6 +245,7 @@ sub read_grub2 { push @{$bootloader{entries}}, $entry if $entry; $entry = { label => $1 }; } elsif (/linux\s+(\S+)\s+(.*)?/ || /module\s+(\S+vmlinu\S+)\s+(.*)?/) { + $entry->{type} = 'image'; @$entry{qw(kernel_or_dev append)} = ($1, $2); } elsif (/initrd\s+(\S+)/ || /module\s+(\S+initrd\S+)\s+(.*)?/) { $entry->{initrd} = $1; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 9bc617927..572f8140d 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,6 +1,8 @@ - drakboot: o assume grub2.cfg is UTF-8 encoded o read back xen conf from grub2 + o set entries type when reading back grub2 conf, thus fixing + switching back to grub-legacy (mga#9563) - fix finding translated help (mga#9619) Version 15.34 - 4 April 2013 |