diff options
| author | Christophe Fergeau <cfergeau@mandriva.com> | 2010-02-10 11:22:17 +0000 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@mandriva.com> | 2010-02-10 11:22:17 +0000 |
| commit | e6b400a507f8afc35552032e5bfc5a92b743a31c (patch) | |
| tree | 2fbf728dc4f39a7e5bddea76ed30738f4cf30014 | |
| parent | c43f57b4a09bfc6626d66ea40991f16be961b1d1 (diff) | |
| download | drakx-e6b400a507f8afc35552032e5bfc5a92b743a31c.tar drakx-e6b400a507f8afc35552032e5bfc5a92b743a31c.tar.gz drakx-e6b400a507f8afc35552032e5bfc5a92b743a31c.tar.bz2 drakx-e6b400a507f8afc35552032e5bfc5a92b743a31c.tar.xz drakx-e6b400a507f8afc35552032e5bfc5a92b743a31c.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/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 25817e105..311e64e1a 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,4 @@ +- fix invocation of grub-md5-crypt from within installer (#57461) - add support for asturian (#56990) - drakboot: o fix crypted password detection diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index be7f5bebc..37f7722ca 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1679,7 +1679,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)) { |