search for: do_touch

...abel\n"); + + len = length_without_training_slash (root); + + if (asprintf (&sys_autorelabelpath, "%.*s/.autorelabel", + len, root) == -1) { + if (verbose) + fprintf (stderr, "asprintf/autorelabelpath failed\n"); + return -1; + } + + return do_touch (sys_autorelabelpath); } diff --git a/generator/actions.ml b/generator/actions.ml index a59fe31..3bb91c8 100644 --- a/generator/actions.ml +++ b/generator/actions.ml @@ -11928,12 +11928,19 @@ New (SVR4) portable format with a checksum. name = "selinux_relabel"; style = RErr, [P...

[ I realized that we were discussing adding this feature, in various private email, IRC, and this long bugzilla thread: https://bugzilla.redhat.com/show_bug.cgi?id=1060423 That's not how we should do things. Let's discuss it on the mailing list. ] One thing that virt-customize/virt-sysprep/virt-builder have to do is relabel SELinux guests. What we do at the moment

This started as a simple warning-elimination change. I'll get back to that series shortly ;-) It turned into a factorization and constification exercise during which I got a taste of ocaml. Thanks to Rich Jones for help with a few snippets in generator.ml. The overall result is that many previously-manually-maintained bits from daemon/*.c functions are now hoisted into the automatically-

.../daemon/file.c b/daemon/file.c index 2756755..a5b3e85 100644 --- a/daemon/file.c +++ b/daemon/file.c @@ -29,6 +29,10 @@ #include "daemon.h" #include "actions.h" +GUESTFSD_EXT_CMD(str_file, file); +GUESTFSD_EXT_CMD(str_zcat, zcat); +GUESTFSD_EXT_CMD(str_bzcat, bzcat); + int do_touch (const char *path) { @@ -473,7 +477,7 @@ do_file (const char *path) const char *flags = is_dev ? "-zbsL" : "-zb"; char *out, *err; - int r = command (&out, &err, "file", flags, path, NULL); + int r = command (&out, &err, str_file, flags, path...

...t a/daemon/file.c b/daemon/file.c index 2756755..8f86bec 100644 --- a/daemon/file.c +++ b/daemon/file.c @@ -29,6 +29,10 @@ #include "daemon.h" #include "actions.h" +GUESTFS_EXT_CMD(str_file, file); +GUESTFS_EXT_CMD(str_zcat, zcat); +GUESTFS_EXT_CMD(str_bzcat, bzcat); + int do_touch (const char *path) { @@ -473,7 +477,7 @@ do_file (const char *path) const char *flags = is_dev ? "-zbsL" : "-zb"; char *out, *err; - int r = command (&out, &err, "file", flags, path, NULL); + int r = command (&out, &err, str_file, flags, path...

.../file.c b/daemon/file.c index 84874dc6f..da4218c45 100644 --- a/daemon/file.c +++ b/daemon/file.c @@ -30,10 +30,6 @@ #include "actions.h" #include "optgroups.h" -GUESTFSD_EXT_CMD(str_file, file); -GUESTFSD_EXT_CMD(str_zcat, zcat); -GUESTFSD_EXT_CMD(str_bzcat, bzcat); - int do_touch (const char *path) { @@ -505,7 +501,7 @@ do_file (const char *path) char *out; CLEANUP_FREE char *err = NULL; - int r = command (&out, &err, str_file, flags, path, NULL); + int r = command (&out, &err, "file", flags, path, NULL); if (r == -1) { free (o...

...b/daemon/file.c @@ -30,9 +30,7 @@ #include "actions.h" #include "optgroups.h" -GUESTFSD_EXT_CMD(str_file, file); -GUESTFSD_EXT_CMD(str_zcat, zcat); -GUESTFSD_EXT_CMD(str_bzcat, bzcat); +DECLARE_EXTERNAL_COMMANDS ("file", "zcat", "bzcat") int do_touch (const char *path) @@ -505,7 +503,7 @@ do_file (const char *path) char *out; CLEANUP_FREE char *err = NULL; - int r = command (&out, &err, str_file, flags, path, NULL); + int r = command (&out, &err, "file", flags, path, NULL); if (r == -1) { free (out)...

This is a simpler patch that removes GUESTFSD_EXT_CMD completely.

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