diff options
| author | Thierry Vignaud <tv@mageia.org> | 2013-04-05 11:33:57 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2013-04-05 11:33:57 +0000 |
| commit | 7625287416073a669b3f7d4a8836a4bcdaf0d563 (patch) | |
| tree | 9b5cffe656c81f9c4be43eea7bd35c043f345d4f | |
| parent | 54643229cb7453f41e082a12d1ea927432437b57 (diff) | |
| download | drakx-7625287416073a669b3f7d4a8836a4bcdaf0d563.tar drakx-7625287416073a669b3f7d4a8836a4bcdaf0d563.tar.gz drakx-7625287416073a669b3f7d4a8836a4bcdaf0d563.tar.bz2 drakx-7625287416073a669b3f7d4a8836a4bcdaf0d563.tar.xz drakx-7625287416073a669b3f7d4a8836a4bcdaf0d563.zip | |
assume grub2.cfg is UTF-8 encoded
| -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) |