summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2010-02-08 15:31:48 +0000
committerThierry Vignaud <tv@mandriva.org>2010-02-08 15:31:48 +0000
commit103168359b5574c1491912750d57d5274ade5c8b (patch)
treea1cfe950c71569903764b830a3684e4e26ac2f18
parent6309f1af34519c066af8f8e9acc5a875a0023d35 (diff)
downloaddrakx-103168359b5574c1491912750d57d5274ade5c8b.tar
drakx-103168359b5574c1491912750d57d5274ade5c8b.tar.gz
drakx-103168359b5574c1491912750d57d5274ade5c8b.tar.bz2
drakx-103168359b5574c1491912750d57d5274ade5c8b.tar.xz
drakx-103168359b5574c1491912750d57d5274ade5c8b.zip
(write_grub) ensure /boot/grub/menu.lst permissions are 0600 since it
can contains a password (backported from trunk)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/bootloader.pm2
-rw-r--r--perl-install/install/NEWS2
3 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index cc425822b..e48de10db 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,8 @@
- drakboot:
o add support for crypted grub passwords (and default to encrypt)
o allow timeout to be '0'
+ o ensure /boot/grub/menu.lst permissions are 0600 since it can
+ contains a password
Version 11.71.10 - 17 September 2009
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index c8b2201f1..afbc7ea2c 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1770,7 +1770,7 @@ sub write_grub {
my $f = "$::prefix/boot/grub/menu.lst";
log::l("writing grub config to $f");
renamef($f, $f . ($o_backup_extension || '.old'));
- output($f, map { "$_\n" } @conf);
+ output_with_perm($f, 0600, map { "$_\n" } @conf);
}
{
my $f = "$::prefix/boot/grub/install.sh";
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index fe85ec972..36b2eb899 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,8 @@
- bootloader configuration:
o add support for crypted grub passwords (and default to encrypt)
o allow timeout to be '0'
+ o ensure /boot/grub/menu.lst permissions are 0600 since it can
+ contains a password
Version 11.71.10 - 17 September 2009