vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/osdep/unix/exec.c (grub_util_exec_redirect): Remove

Browse source 
references to mdadm from otherwise generic code.
(grub_util_exec_pipe): Likewise.
(grub_util_exec_pipe_stderr): Likewise.
* grub-core/osdep/unix/getroot.c (grub_util_pull_lvm_by_command):
This function calls vgs, not mdadm; adjust variable names
accordingly.
This commit is contained in:
Colin Watson 2013-11-27 11:22:31 +00:00
parent cf8c80ff77
commit 16ef26fd3a
3 changed files with 45 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

10
grub-core/osdep/unix/getroot.c
View file

@ -567,7 +567,7 @@ grub_util_pull_lvm_by_command (const char *os_dev)
const char *argv[8];
int fd;
pid_t pid;
FILE *mdadm;
FILE *vgs;
char *buf = NULL;
size_t len = 0;
char *vgname = NULL;
@ -622,16 +622,16 @@ grub_util_pull_lvm_by_command (const char *os_dev)
if (!pid)
return;
/* Parent. Read mdadm's output. */
mdadm = fdopen (fd, "r");
if (! mdadm)
/* Parent. Read vgs' output. */
vgs = fdopen (fd, "r");
if (! vgs)
{
grub_util_warn (_("Unable to open stream from %s: %s"),
"vgs", strerror (errno));
goto out;
}
while (getline (&buf, &len, mdadm) > 0)
while (getline (&buf, &len, vgs) > 0)
{
char *ptr;
/* LVM adds two spaces as standard prefix */