summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-09-09 15:09:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-09-09 15:09:16 +0000
commitfd92c67cff4e4b3c9521c8f9b29bbde7e28edd0d (patch)
tree20fd292bce18fc043e4d880c4154d05c06194fad /perl-install
parentbe1c9ffd9895c8161786eb6e435851918b8d518f (diff)
downloaddrakx-backup-do-not-use-fd92c67cff4e4b3c9521c8f9b29bbde7e28edd0d.tar
drakx-backup-do-not-use-fd92c67cff4e4b3c9521c8f9b29bbde7e28edd0d.tar.gz
drakx-backup-do-not-use-fd92c67cff4e4b3c9521c8f9b29bbde7e28edd0d.tar.bz2
drakx-backup-do-not-use-fd92c67cff4e4b3c9521c8f9b29bbde7e28edd0d.tar.xz
drakx-backup-do-not-use-fd92c67cff4e4b3c9521c8f9b29bbde7e28edd0d.zip
o allow UTF8 in /boot/grub/menu.lst (#43714)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/bootloader.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 03b4d5633..b2f3836e4 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -4,6 +4,7 @@
(requires e2fsprogs-1.41.1-2mnb2)
- drakboot --boot
o drop the ability to set mem=xxx
+ o allow UTF8 in /boot/grub/menu.lst (#43714)
Version 11.38 - 8 September 2008
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index e121c6613..0afad1983 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -273,7 +273,7 @@ sub read_grub_menu_lst {
my $menu_lst_file = "$::prefix/boot/grub/menu.lst";
-e $menu_lst_file or return;
- foreach (cat_($menu_lst_file)) {
+ foreach (MDK::Common::File::cat_utf8($menu_lst_file)) {
my $verbatim = $_;
chomp;
s/^\s*//; s/\s*$//;