similar to: [PATCH] daemon: use btrfs(1) to get btrfs labels

blkid(1) (or actually, libblkid) seems to handle filesystem labels up to 127 characters. Considering that btrfs labels can be up to 128 characters, this means long labels are not read correctly (i.e. get truncated) by blkid. Furthermore, ntfs labels are actually unicode, and libblkid seems to not decode them correctly. Hence, if ntfsprogs is available invoke `ntfslabel` to get the label of ntfs

blkid(1) (or actually, libblkid) seems to handle filesystem labels up to 127 characters. Considering that btrfs labels can be up to 255 characters, this means long labels are not read correctly (i.e. get truncated) by blkid. Get the filesystem type, and if btrfs is available invoke `btrfs filesystem` to get the label of btrfs filesystems. Related to RHBZ#1164708. --- daemon/blkid.c | 8

- Btrfs-progs v4.1 introduced new feature of changing uuid of btrfs partition. This patch add support of this. - Introduce set_uuid_random - uuids.c did a lot of deplicated work for changing uuid of fs. Use existing functions. v5: use NOT_SUPPORTED macro improve testcases v4: introduce get_random_uuid improve testcases squash internal API patches v3.1: fix typos v3: set errno

- Btrfs-progs v4.1 introduced new feature of changing uuid of btrfs partition. This patch add support of this. - Introduce set_uuid_random - uuids.c did a lot of deplicated work for changing uuid of fs. Use existing functions. v4: introduce get_random_uuid improve testcases squash internal API patches v3.1: fix typos v3: set errno if feature is not available. Chen Hanxiao (7):

We should use the existing function from specific fs, if not, move it to specific fs files. Chen Hanxiao (5): label: move btrfslabel to btrfs.c label: move e2label to ext2.c and call it locally label: move ntfslabel to ntfs.c label: use existing do_xfs_admin for xfslabel labels: return ENOTSUP if could not set label for specific fs daemon/btrfs.c | 16 +++++++++++ daemon/daemon.h |

- Btrfs-progs v4.1 introduced new feature of changing uuid of btrfs partition. This patch add support of this. - uuids.c did a lot of deplicated work for changing uuid of fs. Use existed functions. -- Introduce new API: btrfstune_set_uuid_random Chen Hanxiao (5): uuid: add support to change uuid of btrfs partition uuid: use existed function of ext2 uuid: use newly introduced

- Btrfs-progs v4.1 introduced new feature of changing uuid of btrfs partition. This patch add support of this. - Introduce set_uuid_random - uuids.c did a lot of deplicated work for changing uuid of fs. Use existing functions. v3.1: fix typos v3: set errno if feature is not available. Chen Hanxiao (9): uuid: add support to change uuid of btrfs partition uuid: use existing function of

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com> --- v6: rename ext_set_e2uuid_random to ext_set_uuid_random improve longdesc of set_uuid_random v5: 1. improve testcases 2. rename set_uuid_random to ext_set_uuid_random 3. drop swap_set_uuid_random, call swap_set_uuid + get_random_uuid daemon/btrfs.c | 19 +++++++++++++++++++ daemon/daemon.h

- Btrfs-progs v4.1 introduced new feature of changing uuid of btrfs partition. This patch add support of this. - uuids.c did a lot of deplicated work for changing uuid of fs. Use existing functions. v3: set errno if feature is not available. Chen Hanxiao (4): uuid: add support to change uuid of btrfs partition uuid: use existing function of ext2 uuid: use newly introduced

--- daemon/btrfs.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ daemon/daemon.h | 1 + daemon/fs-min-size.c | 34 ++++++++++++++++++++++++- generator/actions.ml | 6 ++++- 4 files changed, 110 insertions(+), 2 deletions(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index ddb029d..652a17e 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -2190,3 +2190,74 @@

Replace GUESTFSD_EXT_CMD with a command line option ‘./guestfsd --print-external-commands’

--- daemon/btrfs.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++ daemon/daemon.h | 1 + daemon/fs-min-size.c | 50 ++++++++++++++++++++++++++++++++++++- generator/actions.ml | 6 ++++- 4 files changed, 124 insertions(+), 2 deletions(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index ddb029d..d2d85f3 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -2190,3 +2190,72

This is a simpler patch that removes GUESTFSD_EXT_CMD completely.

Disable the test case temporarily for 2 reasons: 1. Because the default test disk size is 500M, while btrfs convert command think it is too small to convert it(actually, just add 10M or 20M more is enough). 2. Btrfs-progs has may have a tiny bug, when execute the command in guestfish, it report some error, but convert the filesystem to btrfs successfully. Signed-off-by: Pino Tsao

In data mercoledì 24 giugno 2015 15:54:03, Chen Hanxiao ha scritto: > btrfs-progs v4.1 add support to change uuid of btrfs fs. > > Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com> > --- > v2: put btrfs operation back to daemon/btrfs.c > move tests to tests/btrfs > > daemon/btrfs.c | 60 ++++++++++++++++++++++++++++++++++++++++++ >

We should use the existing function from specific fs, if not, move it to specific fs files. Chen Hanxiao (4): labels: move e2label to ext2.c and call it directly labels: move ntfslabel to ntfs.c labels: use existing do_xfs_admin for xfslabel labels: return ENOTSUP if could not set label for specific fs daemon/daemon.h | 2 ++ daemon/ext2.c | 23 ++++++++++++-----

These 3 patches implement support for APIs which must accept a mountable, but don't update apis which must return mountables. Matt

These two patches are probably not completely independent, but separating them is a lot of work. With *both* patches applied, all the tests and extra-tests pass. That's no guarantee however that there isn't a mistake, so I don't think this patch is a candidate for the 1.16 branch, until it's had a lot more testing in development. Rich.

This also implements support for String (Mountable, _) parameters. --- daemon/Makefile.am | 4 ++++ daemon/blkid.c | 6 ------ daemon/blkid.ml | 40 ++++++++++++++++++++++++++++++++++++++++ daemon/blkid.mli | 19 +++++++++++++++++++ daemon/mountable.ml | 43 +++++++++++++++++++++++++++++++++++++++++++ daemon/mountable.mli | 34

Since the daemon links to pcre and use regular expressions, and since the COMPILE_REGEXP macro doesn't depend on any aspects of the library-side code (eg. the guestfs_h handle etc), we can allow the daemon to use the COMPILE_REGEXP macro. Move the macro to "guestfs-internal-all.h" to permit this. --- src/guestfs-internal-all.h | 26 ++++++++++++++++++++++++++ src/guestfs-internal.h