summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2010-02-10 16:59:06 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2010-02-10 16:59:06 +0000
commit85d62c84dad442d232bf2a56fcddd91f9efb4e5d (patch)
tree632f235176d2afd37101a1ec7e7d2de8219658bc
parente7270c1419c6fe696641104a38cb679377f07e8b (diff)
downloaddrakx-backup-do-not-use-85d62c84dad442d232bf2a56fcddd91f9efb4e5d.tar
drakx-backup-do-not-use-85d62c84dad442d232bf2a56fcddd91f9efb4e5d.tar.gz
drakx-backup-do-not-use-85d62c84dad442d232bf2a56fcddd91f9efb4e5d.tar.bz2
drakx-backup-do-not-use-85d62c84dad442d232bf2a56fcddd91f9efb4e5d.tar.xz
drakx-backup-do-not-use-85d62c84dad442d232bf2a56fcddd91f9efb4e5d.zip
fix grub-md5-crypt call when running from a chroot
This should fix encrypted grub passwords in installer (bug #57461)
-rw-r--r--perl-install/bootloader.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 27419ab14..6c4ab9c89 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1639,7 +1639,7 @@ sub crypt_grub_password {
require IPC::Open2;
local $ENV{LC_ALL} = 'C';
my ($his_out, $his_in);
- my $pid = IPC::Open2::open2($his_out, $his_in, "$::prefix/sbin/grub-md5-crypt");
+ my $pid = IPC::Open2::open2($his_out, $his_in, "$::prefix/sbin/grub-md5-crypt", $::prefix ? "--grub-shell=$::prefix/sbin/grub" : ());
my ($line, $res);
while (sysread($his_out, $line, 100)) {