From 72ad8f1b193bcdef0a2170c861cb360b4a183b1a43dab58bba9194384b9b2b8b Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 16 Oct 2014 15:06:01 +0000 Subject: [PATCH] Use just btrfs subvolume list -o $mnt OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=323 --- 0000-hotfix.patch | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/0000-hotfix.patch b/0000-hotfix.patch index e5712e3..fe556db 100644 --- a/0000-hotfix.patch +++ b/0000-hotfix.patch @@ -24,24 +24,7 @@ index 7a4d43d..ceea593 100644 ADD_ARG (argv, i, str_btrfs); ADD_ARG (argv, i, "subvolume"); ADD_ARG (argv, i, "list"); -+ ADD_ARG (argv, i, "-a"); ++ ADD_ARG (argv, i, "-o"); ADD_ARG (argv, i, fs_buf); ADD_ARG (argv, i, NULL); -diff --git a/src/listfs.c b/src/listfs.c -index ffb0adc..db127ea 100644 ---- a/src/listfs.c -+++ b/src/listfs.c -@@ -176,9 +183,11 @@ check_with_vfs_type (guestfs_h *g, const char *device, struct stringsbuf *sb) - - for (size_t i = 0; i < vols->len; i++) { - struct guestfs_btrfssubvolume *this = &vols->val[i]; -+ char *btrfssubvolume_path = this->btrfssubvolume_path; -+ if (STREQ(btrfssubvolume_path, "/@")) btrfssubvolume_path = "/@"; - guestfs___add_sprintf (g, sb, - "btrfsvol:%s/%s", -- device, this->btrfssubvolume_path); -+ device, btrfssubvolume_path); - guestfs___add_string (g, sb, "btrfs"); - } -