similar to: [PATCH] daemon: fold xfs_admin stdout to stderr

Add new api xfs_admin to change parameters of an XFS filesystem. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- daemon/xfs.c | 78 ++++++++++++++++++++++++++++++++++++++++++ generator/generator_actions.ml | 21 ++++++++++++ gobject/Makefile.inc | 6 ++-- guestfs-release-notes.txt | 1 + po/POTFILES | 1 + src/MAX_PROC_NR

ntfsresize sends error messages to stdout. Capture those error messages. --- daemon/ntfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/ntfs.c b/daemon/ntfs.c index aef45a2..762ca88 100644 --- a/daemon/ntfs.c +++ b/daemon/ntfs.c @@ -94,7 +94,7 @@ do_ntfsresize (const char *device, int64_t size, int force) ADD_ARG (argv, i, device); ADD_ARG (argv, i, NULL); -

Use commandrvf() instead of commandvf() to execute e2fsck. A non-zero exit status does not always indicate a failure. Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- daemon/ext2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/ext2.c b/daemon/ext2.c index 65ddae6..8ef6d5f 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -296,9 +296,9 @@ do_e2fsck

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)

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 ++++++++++++-----

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

When the COMMAND_FLAG_FOLD_STDOUT_ON_STDERR flag is passed to command*(), indicate that as stdout=e in debugging message. --- daemon/command.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/daemon/command.c b/daemon/command.c index 73fce56..2423a4e 100644 --- a/daemon/command.c +++ b/daemon/command.c @@ -185,6 +185,7 @@ commandrvf (char **stdoutput, char **stderror,

- add a flag to request chroot for the process, which is done only as very last (before chdir) operation before exec'ing the process in the child: this avoids using CHROOT_IN & CHROOT_OUT around command* invocations, and reduces the code spent in chroot mode - add failure checks for dup2 and open done in child, not proceeding to executing the process if they fail - open /dev/null

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com> --- daemon/daemon.h | 1 + daemon/uuids.c | 12 +----------- daemon/xfs.c | 7 +++++++ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/daemon/daemon.h b/daemon/daemon.h index eeb4ff7..aba6ef2 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -261,6 +261,7 @@ extern int copy_xattrs (const char *src, const char

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com> --- v3: rename do_xfs_admin_uuid to xfs_set_uuid daemon/daemon.h | 1 + daemon/uuids.c | 12 +----------- daemon/xfs.c | 7 +++++++ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/daemon/daemon.h b/daemon/daemon.h index dd7798c..cbe8ada 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -262,6 +262,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

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: GUESTFS_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 .guestfs_ext_cmds -O binary

--- daemon/daemon.h | 1 + daemon/fs-min-size.c | 7 +++++++ daemon/xfs.c | 16 ++++++++++++++++ generator/actions.ml | 6 +++++- 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/daemon/daemon.h b/daemon/daemon.h index 4a969dd..1f0cd30 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -269,6 +269,7 @@ extern int copy_xattrs (const char *src, const char *dest);

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com> --- daemon/btrfs.c | 21 +++++++++++++++++++++ daemon/daemon.h | 4 ++++ daemon/ext2.c | 15 +++++++++++++++ daemon/swap.c | 13 +++++++++++++ daemon/xfs.c | 7 +++++++ 5 files changed, 60 insertions(+) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 4cdc6a7..2b0cae9 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.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):

This flag cannot be disabled (yet) in V5 xfs filesystems; since 2 out of the current 3 tests of xfs_admin check other results than that flag, avoid setting it when not needed. --- generator/actions.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generator/actions.ml b/generator/actions.ml index 9ea5736..14902e7 100644 --- a/generator/actions.ml +++

On Tue, Dec 01, 2015 at 03:59:56PM +0100, Mateusz Guzik wrote: > CHROOT_IN/OUT around commandvf are definitely problematic. chroot should be > done in the child, which also removes the need to chroot out in the > parent. The CHROOT_IN/OUT business does need to be rewritten. Every instance where we currently do something like: CHROOT_IN; r = stat (fd, &statbuf); CHROOT_OUT

- 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

When running commands in the mounted guest (using the "command" API, and APIs based on it), provide the /dev/null from the appliance as open fd for stdin. Commands usually assume stdin is open if they didn't close it explicitly, so this should avoid crashes or misbehavings due to that. --- daemon/command.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)