summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-17 11:36:20 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-17 11:36:20 +0000
commit073f7047d61bd8f85485251c8013b65589cbf9e2 (patch)
tree006b556f34013bd74de35d23a5d11d7634bc67de
parent6036374a6232207f171084298753c7eeb1a31763 (diff)
downloaddrakx-073f7047d61bd8f85485251c8013b65589cbf9e2.tar
drakx-073f7047d61bd8f85485251c8013b65589cbf9e2.tar.gz
drakx-073f7047d61bd8f85485251c8013b65589cbf9e2.tar.bz2
drakx-073f7047d61bd8f85485251c8013b65589cbf9e2.tar.xz
drakx-073f7047d61bd8f85485251c8013b65589cbf9e2.zip
- report_bug: hide grub password (#33634)
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/install/NEWS1
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 3311f87e8..920d319b1 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1059,7 +1059,7 @@ sub report_bug {
header("fstab"), cat_("$::prefix/etc/fstab"),
header("modprobe.conf"), cat_("$::prefix/etc/modprobe.conf"),
header("lilo.conf"), cat_("$::prefix/etc/lilo.conf"),
- header("grub: menu.lst"), cat_("$::prefix/boot/grub/menu.lst"),
+ header("grub: menu.lst"), join('', map { s/^(\s*password)\s+(.*)/$1 xxx/; $_ } cat_("$::prefix/boot/grub/menu.lst")),
header("grub: install.sh"), cat_("$::prefix/boot/grub/install.sh"),
header("grub: device.map"), cat_("$::prefix/boot/grub/device.map"),
header("xorg.conf"), cat_("$::prefix/etc/X11/xorg.conf"),
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 08f1f208a..fdfd62e1a 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- report_bug: hide grub password (#33634)
- fix blocking wait_message (when they pop) (#33676, #33670)
- advertising: restore support for $title in .pl files (wrongly dropped in 10.4.195)
- localization: