similar to: [PATCH v2 0/4] labels: rework

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 |

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com> --- daemon/daemon.h | 1 + daemon/ext2.c | 29 +++++++++++++++++++++++------ daemon/labels.c | 24 +----------------------- 3 files changed, 25 insertions(+), 29 deletions(-) diff --git a/daemon/daemon.h b/daemon/daemon.h index 783d739..0731b09 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -224,6 +224,7 @@ extern int

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

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com> --- daemon/daemon.h | 1 + daemon/labels.c | 22 +--------------------- daemon/ntfs.c | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/daemon/daemon.h b/daemon/daemon.h index 0731b09..7a4b97f 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -282,6 +282,7 @@ extern int

blkid(1) (or actually, libblkid) seems to handle file system 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 file system type, and if btrfs is available invoke `btrfs filesystem` to get the label of btrfs file systems. --- daemon/blkid.c | 6 ++++++ daemon/btrfs.c | 24

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com> --- daemon/btrfs.c | 16 ++++++++++++++++ daemon/daemon.h | 1 + daemon/labels.c | 19 +------------------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 8fcfd81..ee3464d 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -70,6 +70,22 @@ btrfs_get_label (const char *device)

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

This is a simpler patch that removes GUESTFSD_EXT_CMD completely.

This miscellaneous patch adds bindings for: - ntfsfix - ntfsclone - ntfslabel and unifies filesystem label setting through a single API 'set-label' which replaces 'set-e2label' and is also able to set labels on NTFS using the ntfslabel program. 'ntfsfix' has been added as a possible way to fix RHBZ#797760. However I have not found a way to fully fix this bug. See

- 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

btrfs-progs v4.1 add support to change uuid of btrfs fs. Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com> --- daemon/uuids.c | 19 +++++++++++++++++-- generator/actions.ml | 4 ++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/daemon/uuids.c b/daemon/uuids.c index 06b33e9..c18cb55 100644 --- a/daemon/uuids.c +++ b/daemon/uuids.c @@ -30,6 +30,7 @@

- 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

GUESTFSD_EXT_CMD is used by OpenSUSE to track which external commands are run by the daemon and package those commands into the appliance. However because this uses linker trickery it won't work from OCaml code. Replace it with a [nearly] standard C mechanism. Files still have to declare the external commands they will use, eg: DECLARE_EXTERNAL_COMMANDS ("btrfs",

- 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

Similar to commit 52f9cd4882135910ea06e1e50ac6441d455c9ab1, but for xfs filesystems. --- daemon/daemon.h | 4 ++++ daemon/labels.c | 6 ++++++ daemon/xfs.c | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/daemon/daemon.h b/daemon/daemon.h index 0ccbc9e..f442efd 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -253,6 +253,10 @@ extern void main_loop (int sock)

GUESTFSD_EXT_CMD was used by OpenSUSE to track which external commands are run by the daemon and package those commands into the appliance. It is no longer used by recent SUSE builds, so remove it. Thanks: Pino Toscano, Olaf Hering. --- daemon/9p.c | 3 +- daemon/available.c | 7 +-- daemon/base64.c | 6 +-- daemon/blkid.c | 10 ++---

--- daemon/daemon.h | 1 + daemon/labels.c | 3 +++ daemon/swap.c | 21 +++++++++++++++++++++ generator/actions.ml | 4 ++++ 4 files changed, 29 insertions(+) diff --git a/daemon/daemon.h b/daemon/daemon.h index 79a5288..2379e31 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -254,6 +254,7 @@ extern int64_t ntfs_minimum_size (const char *device); /*-- in swap.c --*/

- 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):

guestfsd calls many different tools. Keeping track of all of them is error prone. This patch introduces a new helper macro to put the command string into its own ELF section: GUESTFSD_EXT_CMD(C_variable, command_name); This syntax makes it still possible to grep for used command names. The actual usage of the collected list could be like this: objcopy -j .guestfsd_ext_cmds -O binary

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