diff options
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 1bdcee2ee..8e51bd46b 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,4 +1,5 @@ - drakboot: + o assume grub2.cfg is UTF-8 encoded o read back xen conf from grub2 - draksound o update draksound troubleshooting text (mga#4162) diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index b1d48cd65..461f94760 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -239,7 +239,7 @@ sub read_grub2 { $bootloader{timeout} = $h{GRUB_TIMEOUT}; $bootloader{entries} = []; my $entry; - foreach (cat_("$::prefix/boot/grub2/grub.cfg")) { + foreach (cat_utf8("$::prefix/boot/grub2/grub.cfg")) { next if /^#/; if (/menuentry\s+['"]([^']+)["']/) { push @{$bootloader{entries}}, $entry if $entry; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 97b202310..9bc617927 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,5 @@ - drakboot: + o assume grub2.cfg is UTF-8 encoded o read back xen conf from grub2 - fix finding translated help (mga#9619) |