From: Richard W.M. Jones <rjones@redhat.com>
Date: Thu, 29 Sep 2011 15:08:20 +0000 (+0100)
Subject: daemon: mkswap --help output changed, breaking linuxfsuuid group detection.
X-Git-Tag: 1.12.8~18
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=a1efc555feaddeea1eaa05a7e8ce45a6f51c0c4f;p=libguestfs.git

daemon: mkswap --help output changed, breaking linuxfsuuid group detection.
(cherry picked from commit 4e9ed018475ff4bd5171ed50a47ffae7abbdda4b)
---

diff --git a/daemon/swap.c b/daemon/swap.c
index 99fb563..c2fe13a 100644
--- a/daemon/swap.c
+++ b/daemon/swap.c
@@ -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);