search for: guestfsd_ext_cmd

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 daemon/guestfsd /dev/stdout | strings | sort -u The resulting output will be used to tell mkinitrd wh...

...(r == -1) { reply_with_error ("%s: %s", "btrfs device add --help", err); return -1; diff --git a/daemon/command.c b/daemon/command.c index 02e1dd4..066c773 100644 --- a/daemon/command.c +++ b/daemon/command.c @@ -30,6 +30,7 @@ #include "ignore-value.h" +GUESTFSD_EXT_CMD(str_cp, cp); GUESTFSD_EXT_CMD(str_mount, mount); GUESTFSD_EXT_CMD(str_umount, umount); @@ -179,7 +180,7 @@ set_up_etc_resolv_conf (struct resolver_state *rs) /* Now that the guest's <sysroot>/etc/resolv.conf is out the way, we * can create our own copy of the appliance /etc/res...

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

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

...f external commands I missed the various checksum tools. Signed-off-by: Olaf Hering <olaf at aepfle.de> --- WARNING: not compile tested ... diff --git a/daemon/checksum.c b/daemon/checksum.c index f2e040d..f16a7c0 100644 --- a/daemon/checksum.c +++ b/daemon/checksum.c @@ -31,24 +31,31 @@ GUESTFSD_EXT_CMD(str_find, find); GUESTFSD_EXT_CMD(str_xargs, xargs); +GUESTFSD_EXT_CMD(str_cksum, cksum); +GUESTFSD_EXT_CMD(str_md5sum, md5sum); +GUESTFSD_EXT_CMD(str_sha1sum, sha1sum); +GUESTFSD_EXT_CMD(str_sha224sum, sha224sum); +GUESTFSD_EXT_CMD(str_sha256sum, sha256sum); +GUESTFSD_EXT_CMD(str_sha384sum, sha38...

...*device); +extern int ext_set_label (const char *device, const char *label); /*-- in blkid.c --*/ extern char *get_blkid_tag (const char *device, const char *tag); diff --git a/daemon/ext2.c b/daemon/ext2.c index e8d2655..7bb1221 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -38,6 +38,7 @@ GUESTFSD_EXT_CMD(str_resize2fs, resize2fs); GUESTFSD_EXT_CMD(str_mke2fs, mke2fs); GUESTFSD_EXT_CMD(str_lsattr, lsattr); GUESTFSD_EXT_CMD(str_chattr, chattr); +GUESTFSD_EXT_CMD(str_e2label, e2label); /* https://bugzilla.redhat.com/show_bug.cgi?id=978302#c1 */ int @@ -123,14 +124,30 @@ do_tune2fs_l (const char...

...st@cn.fujitsu.com> --- daemon/btrfs.c | 29 +++++++++++++++++++++++++++++ generator/actions.ml | 18 ++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 39392f7..fd679cf 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -38,6 +38,7 @@ GUESTFSD_EXT_CMD(str_btrfsck, btrfsck); GUESTFSD_EXT_CMD(str_mkfs_btrfs, mkfs.btrfs); GUESTFSD_EXT_CMD(str_umount, umount); GUESTFSD_EXT_CMD(str_btrfsimage, btrfs-image); +GUESTFSD_EXT_CMD(str_btrfsconvert, btrfs-convert); int optgroup_btrfs_available (void) @@ -2083,3 +2084,31 @@ do_btrfs_image (char *const...

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 |

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

...> /* ordinary daemon functions use these to indicate errors > * NB: you don't need to prefix the string with the current command, > diff --git a/daemon/swap.c b/daemon/swap.c > index 26fe30d..923adb2 100644 > --- a/daemon/swap.c > +++ b/daemon/swap.c > @@ -34,6 +34,7 @@ GUESTFSD_EXT_CMD(str_mkswap, mkswap); > GUESTFSD_EXT_CMD(str_swapon, swapon); > GUESTFSD_EXT_CMD(str_swapoff, swapoff); > GUESTFSD_EXT_CMD(str_swaplabel, swaplabel); > +GUESTFSD_EXT_CMD(str_uuidgen, uuidgen); > > /* Confirmed this is true for Linux swap partitions from the Linux sources. */...

This is a simpler patch that removes GUESTFSD_EXT_CMD completely.

...enhanxiao@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 @@ GUESTFSD_EXT_CMD(str_tune2fs, tune2fs); GUESTFSD_EXT_CMD(str_xfs_admin, xfs_admin); GUESTFSD_EXT_CMD(str_swaplabel, swaplabel); +GUESTFSD_EXT_CMD(str_btrfstune, btrfstune); static int e2uuid (const char *device, const char *uuid) @@ -91,6 +92,21 @@ swapuuid (const char *device, const char *uuid) return 0;...

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

...ions use these to indicate errors * NB: you don't need to prefix the string with the current command, * it is added automatically by the client-side RPC stubs. diff --git a/daemon/ntfs.c b/daemon/ntfs.c index 762ca88..f1d12e0 100644 --- a/daemon/ntfs.c +++ b/daemon/ntfs.c @@ -33,6 +33,7 @@ GUESTFSD_EXT_CMD(str_ntfs3g_probe, ntfs-3g.probe); GUESTFSD_EXT_CMD(str_ntfsresize, ntfsresize); GUESTFSD_EXT_CMD(str_ntfsfix, ntfsfix); +GUESTFSD_EXT_CMD(str_ntfslabel, ntfslabel); int optgroup_ntfs3g_available (void) @@ -46,6 +47,29 @@ optgroup_ntfsprogs_available (void) return prog_exists (str_ntfsresiz...

Hi Olaf and Cédric, On Monday, 24 July 2017 18:10:12 CEST Richard W.M. Jones wrote: > Replace GUESTFSD_EXT_CMD with a command line option > ‘./guestfsd --print-external-commands’ This mini-series basically changes the way external programs used in the appliance are collected; this was done 5 years ago (!) as commit 0306c98d319d189281af3c15101c8d343e400f13, to help the creation of appliances in SUSE. Is...

On Thu, Jul 27, 2017 at 04:58:52PM +0200, Pino Toscano wrote: > Hi Olaf and Cédric, > > On Monday, 24 July 2017 18:10:12 CEST Richard W.M. Jones wrote: > > Replace GUESTFSD_EXT_CMD with a command line option > > ‘./guestfsd --print-external-commands’ > > This mini-series basically changes the way external programs used in > the appliance are collected; this was done 5 years ago (!) as > commit 0306c98d319d189281af3c15101c8d343e400f13, to help the creation &...

...t; > src/MAX_PROC_NR | 2 +- > > 3 files changed, 131 insertions(+), 1 deletion(-) > > > > diff --git a/daemon/parted.c b/daemon/parted.c > > index a7bcb99..0ae6e5c 100644 > > --- a/daemon/parted.c > > +++ b/daemon/parted.c > > @@ -33,6 +33,10 @@ GUESTFSD_EXT_CMD(str_parted, parted); > > GUESTFSD_EXT_CMD(str_sfdisk, sfdisk); > > GUESTFSD_EXT_CMD(str_sgdisk, sgdisk); > > > > +#ifndef PARTED_NO_M > > +# define PARTED_NO_M 0 > > +#endif > > What does this bit do? I want to use print_partition_table(xxx, 0) but do n...

...anged, 131 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/daemon/parted.c b/daemon/parted.c > > > > index a7bcb99..0ae6e5c 100644 > > > > --- a/daemon/parted.c > > > > +++ b/daemon/parted.c > > > > @@ -33,6 +33,10 @@ GUESTFSD_EXT_CMD(str_parted, parted); > > > > GUESTFSD_EXT_CMD(str_sfdisk, sfdisk); > > > > GUESTFSD_EXT_CMD(str_sgdisk, sgdisk); > > > > > > > > +#ifndef PARTED_NO_M > > > > +# define PARTED_NO_M 0 > > > > +#endif > > > > > &g...

...c | 30 ++++++++++++++++++------------ > > 1 file changed, 18 insertions(+), 12 deletions(-) > > > > diff --git a/daemon/parted.c b/daemon/parted.c > > index a7bcb99..64a7d3c 100644 > > --- a/daemon/parted.c > > +++ b/daemon/parted.c > > @@ -33,6 +33,12 @@ GUESTFSD_EXT_CMD(str_parted, parted); > > GUESTFSD_EXT_CMD(str_sfdisk, sfdisk); > > GUESTFSD_EXT_CMD(str_sgdisk, sgdisk); > > > > +enum { > > + PARTED_INVALID = -1, > > + /* parted do not support -m option */ > > + PARTED_OPT_NO_M, > > + PARTED_OPT_HAS_M}; &gt...

...st@cn.fujitsu.com> --- daemon/btrfs.c | 29 +++++++++++++++++++++++++++++ generator/actions.ml | 18 ++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 39392f7..7f10792 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -38,6 +38,7 @@ GUESTFSD_EXT_CMD(str_btrfsck, btrfsck); GUESTFSD_EXT_CMD(str_mkfs_btrfs, mkfs.btrfs); GUESTFSD_EXT_CMD(str_umount, umount); GUESTFSD_EXT_CMD(str_btrfsimage, btrfs-image); +GUESTFSD_EXT_CMD(str_btrfsconvert, btrfs-convert); int optgroup_btrfs_available (void) @@ -2083,3 +2084,31 @@ do_btrfs_image (char *const...