mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon: mkswap --help output changed, breaking linuxfsuuid group detection.

Browse Source
This commit is contained in:
Richard W.M. Jones
2011-09-29 16:08:20 +01:00
parent d020350c31
commit 4e9ed01847
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
daemon/swap.c
View File

@@ -43,8 +43,13 @@ optgroup_linuxfsuuid_available (void)
char *err;
int av;
/* Ignore return code - mkswap --help *will* fail. */
ignore_value (command (NULL, &err, "mkswap", "--help", NULL));
/* Upstream util-linux have been gradually changing '--help' to go
* from stderr to stdout, and changing the return code from 1 to 0.
* Thus we need to fold stdout and stderr together, and ignore the
* return code.
*/
ignore_value (commandf (NULL, &err, COMMAND_FLAG_FOLD_STDOUT_ON_STDERR,
"mkswap", "--help", NULL));
av = strstr (err, "-U") != NULL;
free (err);