similar to: [PATCH] ntfsresize: Capture errors sent to stdout (RHBZ#1166618).

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

Apparent newer versions of that report everything on stdout, including error messages; since we only print something on failure, fold stdout to stderr so we can see everything on failure. --- daemon/xfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/xfs.c b/daemon/xfs.c index abc2736..7f72e6a 100644 --- a/daemon/xfs.c +++ b/daemon/xfs.c @@ -537,7 +537,7 @@

- 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

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,

Allows more sharing between the daemon and the inspection program. --- daemon/Makefile.am | 2 + daemon/cleanups.c | 80 ++++++++++ daemon/cleanups.h | 47 ++++++ daemon/command.c | 436 +++++++++++++++++++++++++++++++++++++++++++++++++++++ daemon/command.h | 41 +++++ daemon/daemon.h | 47 +----- daemon/guestfsd.c | 392 ----------------------------------------------- po/POTFILES

On Wed, Dec 02, 2015 at 02:00:57PM +0100, Pino Toscano wrote: > - 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

Some OSes (e.g. Windows Server 2012 R2) fail to boot if the disk GPT GUID has changed. To preserve disk GUID e.g. during virt-resize, we need a way to get/set disk GUIDs. --- daemon/parted.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ generator/actions.ml | 37 ++++++++++++++++++++++++++++++++ src/MAX_PROC_NR | 2 +- 3 files changed, 98 insertions(+), 1 deletion(-) diff

This action moves second(backup) GPT header to the end of the disk. It is usable in in-place image expanding, since free space after second GPT header is unusable. To use additional space, we have to move second header. This is what sgdisk -e does. However, sgdisk -e may perform additional actions if the partition table has unexpected params (e.g. if we call sgdisk -e /dev/sda1, it may fix

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

From: "Richard W.M. Jones" <rjones at redhat.com> This reverts commit a9c8123c72db47bcab8dd738e8d5256a9ae87f11. --- daemon/file.c | 18 +++--------------- daemon/parted.c | 3 +-- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/daemon/file.c b/daemon/file.c index 057e15d..91746e0 100644 --- a/daemon/file.c +++ b/daemon/file.c @@ -525,7 +525,7 @@

part-expand-gpt takes extreme cautions and doesn't proceed to writing to the disk if the preliminary dry run of sgdisk has generated any warnings on stdout. This blocks the use of part-expand-gpt on disk shrink (with disk resize being the main usecase for part-expand-gpt), because sgdisk dry run produces a warning in that case. So remove the excessive safety check, and leave it up to the

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

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

One more after this, and "make syntax-check" will pass once more. >From 5c360133c0d4e09531d432abca0629798b87ff39 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering at redhat.com> Date: Mon, 9 Nov 2009 15:14:53 +0100 Subject: [PATCH libguestfs] indent with spaces, not TABs * HACKING: Expand indentation TABs. * configure.ac: Likewise. * daemon/daemon.h: Likewise. *

add udev_settle calls to print_partition_table and sgdisk_info_extract_field because the inspect-os calls guestfs_part_get_parttype and guestfs_part_get_gpt_guid for all parition devices found and this causes intermittent with opening block devices that are certainly present yet RESOLVE_DEVICE macro would fail wiht ENOENT. --- daemon/parted.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff

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

Causes a compiler warning to be emitted if you omit the trailing NULL argument. --- daemon/daemon.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/daemon.h b/daemon/daemon.h index 8f932d2..df1ba3a 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -100,9 +100,9 @@ extern char **split_lines (char *str); #define COMMAND_FLAG_CHROOT_COPY_FILE_TO_STDIN 2048

On Thu, Nov 19, 2015 at 05:38:25PM +0100, Pino Toscano wrote: > 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. This does not

e2fsck returns 1 in case of "file system errors corrected". We treat it as success in normal e2fsck, but fail if e2fsck is run by resize2fs. Change 'manual' execution of e2fsck to dedicated function call. --- daemon/ext2.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/daemon/ext2.c b/daemon/ext2.c index 5dd67c7..95a65ae 100644 ---

Some OSes (e.g. Windows Server 2012 R2) fail to boot if the disk GPT GUID has changed. To preserve disk guid e.g. during virt-resize, we need a way to get/set disk GUIDs. --- daemon/parted.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ generator/actions.ml | 37 ++++++++++++++++++++++++++++++++ src/MAX_PROC_NR | 2 +- 3 files changed, 98 insertions(+), 1 deletion(-) diff