Libguestfs - Dec 2011 - [PATCH] blkid: remove the -o export option

The -o export option is the default, so remove this useless option.

Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com>
---
 daemon/blkid.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/daemon/blkid.c b/daemon/blkid.c
index f23eac6..e6bcf32 100644
--- a/daemon/blkid.c
+++ b/daemon/blkid.c
@@ -119,7 +119,7 @@ blkid_with_p_opt(const char *device)
   int size = 0, alloc = 0;
 
   r = command(&out, &err, "blkid", "-c",
"/dev/null",
-               "-p", "-i", "-o",
"export", device, NULL);
+               "-p", "-i", device, NULL);
   if (r == -1) {
     reply_with_error("%s", err);
     goto error;
@@ -132,7 +132,7 @@ blkid_with_p_opt(const char *device)
     goto error;
   }
 
-  /* Parse the output of blkid -p -i -o export:
+  /* Parse the output of blkid -p -i:
    * UUID=b6d83437-c6b4-4bf0-8381-ef3fc3578590
    * VERSION=1.0
    * TYPE=ext2
-- 
1.7.8

On Thu, Dec 22, 2011 at 02:19:47PM +0800, Wanlong Gao
wrote:
> The -o export option is the default, so remove this useless option.
> 
> Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com>
> ---
>  daemon/blkid.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/daemon/blkid.c b/daemon/blkid.c
> index f23eac6..e6bcf32 100644
> --- a/daemon/blkid.c
> +++ b/daemon/blkid.c
> @@ -119,7 +119,7 @@ blkid_with_p_opt(const char *device)
>    int size = 0, alloc = 0;
>  
>    r = command(&out, &err, "blkid", "-c",
"/dev/null",
> -               "-p", "-i", "-o",
"export", device, NULL);
> +               "-p", "-i", device, NULL);
>    if (r == -1) {
>      reply_with_error("%s", err);
>      goto error;
> @@ -132,7 +132,7 @@ blkid_with_p_opt(const char *device)
>      goto error;
>    }
>  
> -  /* Parse the output of blkid -p -i -o export:
> +  /* Parse the output of blkid -p -i:
>     * UUID=b6d83437-c6b4-4bf0-8381-ef3fc3578590
>     * VERSION=1.0
>     * TYPE=ext2
Is it worth doing this?  The '-o export' doesn't cost us anything
and
they might change the default in future.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://et.redhat.com/~rjones/virt-top