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

inspection: Fix parsing of btrfs subvolumes in /etc/fstab.

Browse Source 
The code to parse btrfs subvol entries in /etc/fstab failed if the
entry had more than one comma-separated option, for example:

/dev/sda4 /home btrfs rw,user,subvol=foo 0 0

This commit fixes that code to use Augeas correctly.

Fixes commit 7ba0e10501.

Reported by: Zhongfu Li
https://bugs.launchpad.net/ubuntu/+source/libguestfs/+bug/1615337
This commit is contained in:
Richard W.M. Jones
2016-08-25 11:08:15 +01:00
parent ecbf093850
commit 738c3bf4fd
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/inspect-fs-unix.c
View File

@@ -1347,27 +1347,28 @@ check_fstab (guestfs_h *g, struct inspect_fs *fs)
if (vfstype == NULL) return -1;
if (STREQ (vfstype, "btrfs")) {
char **opt;
size_t i;
snprintf (augpath, sizeof augpath, "%s/opt", *entry);
CLEANUP_FREE_STRING_LIST char **opts = guestfs_aug_match (g, augpath);
if (opts == NULL) return -1;
for (opt = opts; *opt; opt++) {
CLEANUP_FREE char *optname = guestfs_aug_get (g, augpath);
for (i = 0; opts[i] != NULL; ++i) {
CLEANUP_FREE char *optname = NULL, *optvalue = NULL, *subvol = NULL;
char *old_mountable;
optname = guestfs_aug_get (g, opts[i]);
if (optname == NULL) return -1;
if (STREQ (optname, "subvol")) {
CLEANUP_FREE char *subvol = NULL;
char *new;
optvalue = safe_asprintf (g, "%s/value", opts[i]);
snprintf (augpath, sizeof augpath, "%s/value", *opt);
subvol = guestfs_aug_get (g, augpath);
subvol = guestfs_aug_get (g, optvalue);
if (subvol == NULL) return -1;
new = safe_asprintf (g, "btrfsvol:%s/%s", mountable, subvol);
free (mountable);
mountable = new;
old_mountable = mountable;
mountable = safe_asprintf (g, "btrfsvol:%s/%s", mountable, subvol);
free (old_mountable);
}
}
}