Displaying 2 results from an estimated 2 matches for "blkid_with_p_opt".
Did you mean:
blkid_with_p_i_opt
2011 Dec 22
1
[PATCH] blkid: remove the -o export option
...seless 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, N...
2011 Dec 05
1
[PATCH] blkid: split the RHEL5 which can't support some options
...NULL);
+ if (r == -1) {
+ reply_with_error("Could not run 'blkid' command");
+ free(err);
+ return -1;
+ }
+
+ if (err && strstr(err, "invalid option --"))
+ result = 0;
+ else
+ result = 1;
+ free(err);
+ return result;
+}
+
+static char **
+blkid_with_p_opt(const char *device)
{
int r;
char *out = NULL, *err = NULL;
char **lines = NULL;
-
char **ret = NULL;
int size = 0, alloc = 0;
- const char *blkid[] = {"blkid", "-p", "-i", "-o", "export", device, NULL};
- r = commandv(&out,...