mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs_filesystem_show: work with btrfs < 4.3.1

Browse Source 
Versions older than 4.3.1 output also the version string after the
output.  Ignore such line, since it isn't relevant to what
btrfs_filesystem_show needs.
This commit is contained in:
Pino Toscano
2016-05-16 14:23:07 +02:00
parent 653e374ef6
commit 839ae5bcd5
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/btrfs.c
View File

@@ -2270,6 +2270,12 @@ do_btrfs_filesystem_show (const char *device)
} else if (STRPREFIX (lines[i], "\t*** Some devices missing")) {
reply_with_error_errno (ENODEV, "%s: missing devices", device);
return NULL;
} else if (STRPREFIX (lines[i], "btrfs-progs v")) {
/* Older versions of btrfs-progs output also the version string
* (the same as `btrfs --version`. This has been fixed upstream
* since v4.3.1, commit e29ec82e4e66042ca55bf8cd9ef609e3b21a7eb7.
* To support these older versions, ignore the version line. */
continue;
} else {
reply_with_error ("unrecognized line in output from 'btrfs filesystem show': %s", lines[i]);
return NULL;