rpm/libguestfs
SHA256
1
0
Fork 0
forked from pool/libguestfs
Code Pull Requests Activity

Use just btrfs subvolume list -o $mnt

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=323
This commit is contained in:
Olaf Hering 2014-10-16 15:06:01 +00:00 committed by Git OBS Bridge
parent 3200147e0a
commit 72ad8f1b19
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
0000-hotfix.patch
View File

@ -24,24 +24,7 @@ index 7a4d43d..ceea593 100644
ADD_ARG (argv, i, str_btrfs); ADD_ARG (argv, i, str_btrfs);
ADD_ARG (argv, i, "subvolume"); ADD_ARG (argv, i, "subvolume");
ADD_ARG (argv, i, "list"); 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, fs_buf);
ADD_ARG (argv, i, NULL); 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, "<FS_TREE>/@")) btrfssubvolume_path = "/@";
guestfs___add_sprintf (g, sb,
"btrfsvol:%s/%s",
- device, this->btrfssubvolume_path);
+ device, btrfssubvolume_path);
guestfs___add_string (g, sb, "btrfs");
}