[libvirt] [sandbox 00/10] Actually use host-image mounts on /

older
[libvirt] [libvirt-python PATCH]...

Cédric Bosdonnat

25 Jun 2015 25 Jun '15

12:49 p.m.

Hi all, In the virt-sandbox documentation we had examples with host-image mounts targetting /. However the / in the sandbox was still the host one. The main goal of this patch series is to fix that problem. This will also be needed to run docker container with libvirt-sandbox. I also added some configure flags to disable lzma or zlib support at build time. At least opensuse 13.2 doesn't have static lzma. Cédric Bosdonnat (10): Allow disabling build with lzma. Allow disabling zlib support. Enable strcmp checks in libvirt-sandbox-init-qemu.c Copy init-common and all its deps to config subdir Remove init-common dependency on libvirt-sandbox.so init-qemu: extract the mounts.cfg entry mounting code qemu: use mounts targeting / as root Add function to check if there is a mount with / target Don't add sandbox:root device if we have a mount targetting / container builder: don't expose host rootfs if unneeded cfg.mk | 2 +- configure.ac | 37 ++++- libvirt-sandbox/Makefile.am | 41 +++-- .../libvirt-sandbox-builder-container.c | 22 +-- libvirt-sandbox/libvirt-sandbox-builder-machine.c | 136 +++++++++++++++-- libvirt-sandbox/libvirt-sandbox-config-all.h | 61 ++++++++ .../libvirt-sandbox-config-interactive.c | 2 +- .../libvirt-sandbox-config-mount-file.c | 2 +- .../libvirt-sandbox-config-mount-guest-bind.c | 2 +- .../libvirt-sandbox-config-mount-host-bind.c | 2 +- .../libvirt-sandbox-config-mount-host-image.c | 2 +- libvirt-sandbox/libvirt-sandbox-config-mount-ram.c | 2 +- libvirt-sandbox/libvirt-sandbox-config-mount.c | 2 +- .../libvirt-sandbox-config-network-address.c | 2 +- ...rt-sandbox-config-network-filterref-parameter.c | 2 +- .../libvirt-sandbox-config-network-filterref.c | 2 +- .../libvirt-sandbox-config-network-route.c | 2 +- libvirt-sandbox/libvirt-sandbox-config-network.c | 2 +- .../libvirt-sandbox-config-service-generic.c | 2 +- .../libvirt-sandbox-config-service-systemd.c | 2 +- libvirt-sandbox/libvirt-sandbox-config-service.c | 2 +- libvirt-sandbox/libvirt-sandbox-config.c | 23 ++- libvirt-sandbox/libvirt-sandbox-config.h | 1 + libvirt-sandbox/libvirt-sandbox-init-common.c | 5 +- libvirt-sandbox/libvirt-sandbox-init-qemu.c | 166 +++++++++++++++++---- libvirt-sandbox/libvirt-sandbox.h | 18 +-- libvirt-sandbox/libvirt-sandbox.sym | 1 + 27 files changed, 442 insertions(+), 101 deletions(-) create mode 100644 libvirt-sandbox/libvirt-sandbox-config-all.h -- 2.1.4

Show replies by date

Cédric Bosdonnat

25 Jun 25 Jun

12:49 p.m.

New subject: [libvirt] [sandbox 01/10] Allow disabling build with lzma.

Some linux distributions don't package static lzma library. Allow disabling it. --- configure.ac | 14 +++++++++++++- libvirt-sandbox/libvirt-sandbox-init-qemu.c | 12 ++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 140fb8c..834a444 100644 --- a/configure.ac +++ b/configure.ac @@ -81,7 +81,14 @@ PKG_CHECK_MODULES(LIBVIRT_GLIB, libvirt-glib-1.0 >= $LIBVIRT_GOBJECT_REQUIRED) PKG_CHECK_MODULES(LIBVIRT_GOBJECT, libvirt-gobject-1.0 >= $LIBVIRT_GOBJECT_REQUIRED) PKG_CHECK_MODULES(LIBVIRT_GCONFIG, libvirt-gconfig-1.0 >= $LIBVIRT_GCONFIG_REQUIRED) PKG_CHECK_MODULES(ZLIB, zlib >= $ZLIB_REQUIRED) -PKG_CHECK_MODULES(LZMA, liblzma >= $LZMA_REQUIRED) +AC_ARG_WITH([lzma], + [AS_HELP_STRING([--with-lzma], + [add LZMA support @<:@default=yes@:>@])]) +m4_divert_text([DEFAULTS], [with_lzma=yes]) + +if test "$with_lzma" = "yes" ; then + PKG_CHECK_MODULES(LZMA, liblzma >= $LZMA_REQUIRED) +fi LIBVIRT_SANDBOX_CAPNG LIBVIRT_SANDBOX_GETTEXT @@ -118,6 +125,11 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([ Libraries:]) AC_MSG_NOTICE([]) +if test "$with_lzma" != "no" ; then +AC_MSG_NOTICE([ LZMA: $LZMA_CFLAGS $LZMA_LIBS]) +else +AC_MSG_NOTICE([ LZMA: no]) +fi AC_MSG_NOTICE([ GOBJECT: $GOBJECT_CFLAGS $GOBJECT_LIBS]) AC_MSG_NOTICE([ LIBVIRT_GOBJECT: $LIBVIRT_GOBJECT_CFLAGS $LIBVIRT_GOBJECT_LIBS]) AC_MSG_NOTICE([]) diff --git a/libvirt-sandbox/libvirt-sandbox-init-qemu.c b/libvirt-sandbox/libvirt-sandbox-init-qemu.c index 2c2c803..e91dbcf 100644 --- a/libvirt-sandbox/libvirt-sandbox-init-qemu.c +++ b/libvirt-sandbox/libvirt-sandbox-init-qemu.c @@ -42,7 +42,9 @@ #include <fcntl.h> #include <sys/reboot.h> #include <termios.h> +#if WITH_LZMA #include <lzma.h> +#endif /* WITH_LZMA */ #include <zlib.h> #define ATTR_UNUSED __attribute__((__unused__)) @@ -492,6 +494,7 @@ has_suffix(const char *filename, const char *ext) offset[strlen(ext)] == '\0'); } +#if WITH_LZMA static char * load_module_file_lzma(const char *filename, size_t *len) { @@ -548,6 +551,15 @@ load_module_file_lzma(const char *filename, size_t *len) free(xzdata); return data; } +#else +static char * +load_module_file_lzma(const char *filename, size_t *len) +{ + fprintf(stderr, "libvirt-sandbox-init-qemu: %s: " + "lzma support disabled, can't read module %s\n", __func__, filename); + exit_poweroff(); +} +#endif /* WITH_LZMA */ static char * load_module_file_zlib(const char *filename, size_t *len) -- 2.1.4

Daniel P. Berrange

12:51 p.m.

New subject: [libvirt] [sandbox 01/10] Allow disabling build with lzma.

On Thu, Jun 25, 2015 at 06:49:38PM +0200, Cédric Bosdonnat wrote:

...

Some linux distributions don't package static lzma library. Allow disabling it. --- configure.ac | 14 +++++++++++++- libvirt-sandbox/libvirt-sandbox-init-qemu.c | 12 ++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-)

ACK Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

Cédric Bosdonnat

12:49 p.m.

New subject: [libvirt] [sandbox 02/10] Allow disabling zlib support.

Some distributions may not have static zlib package. Allow disabling it at build time. --- configure.ac | 16 +++++++++++++++- libvirt-sandbox/libvirt-sandbox-init-qemu.c | 12 ++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 834a444..99d22d7 100644 --- a/configure.ac +++ b/configure.ac @@ -80,7 +80,16 @@ PKG_CHECK_MODULES(LIBVIRT, libvirt >= $LIBVIRT_REQUIRED) PKG_CHECK_MODULES(LIBVIRT_GLIB, libvirt-glib-1.0 >= $LIBVIRT_GOBJECT_REQUIRED) PKG_CHECK_MODULES(LIBVIRT_GOBJECT, libvirt-gobject-1.0 >= $LIBVIRT_GOBJECT_REQUIRED) PKG_CHECK_MODULES(LIBVIRT_GCONFIG, libvirt-gconfig-1.0 >= $LIBVIRT_GCONFIG_REQUIRED) -PKG_CHECK_MODULES(ZLIB, zlib >= $ZLIB_REQUIRED) + +AC_ARG_WITH([zlib], + [AS_HELP_STRING([--with-zlib], + [add ZLIB support @<:@default=yes@:>@])]) +m4_divert_text([DEFAULTS], [with_zlib=yes]) + +if test "$with_zlib" = "yes" ; then + PKG_CHECK_MODULES(ZLIB, zlib >= $ZLIB_REQUIRED) + fi + AC_ARG_WITH([lzma], [AS_HELP_STRING([--with-lzma], [add LZMA support @<:@default=yes@:>@])]) @@ -130,6 +139,11 @@ AC_MSG_NOTICE([ LZMA: $LZMA_CFLAGS $LZMA_LIBS]) else AC_MSG_NOTICE([ LZMA: no]) fi +if test "$with_zlib" != "no" ; then +AC_MSG_NOTICE([ ZLIB: $ZLIB_CFLAGS $ZLIB_LIBS]) +else +AC_MSG_NOTICE([ ZLIB: no]) +fi AC_MSG_NOTICE([ GOBJECT: $GOBJECT_CFLAGS $GOBJECT_LIBS]) AC_MSG_NOTICE([ LIBVIRT_GOBJECT: $LIBVIRT_GOBJECT_CFLAGS $LIBVIRT_GOBJECT_LIBS]) AC_MSG_NOTICE([]) diff --git a/libvirt-sandbox/libvirt-sandbox-init-qemu.c b/libvirt-sandbox/libvirt-sandbox-init-qemu.c index e91dbcf..a20db77 100644 --- a/libvirt-sandbox/libvirt-sandbox-init-qemu.c +++ b/libvirt-sandbox/libvirt-sandbox-init-qemu.c @@ -45,7 +45,9 @@ #if WITH_LZMA #include <lzma.h> #endif /* WITH_LZMA */ +#if WITH_ZLIB #include <zlib.h> +#endif /* WITH_ZLIB */ #define ATTR_UNUSED __attribute__((__unused__)) @@ -561,6 +563,7 @@ load_module_file_lzma(const char *filename, size_t *len) } #endif /* WITH_LZMA */ +#if WITH_ZLIB static char * load_module_file_zlib(const char *filename, size_t *len) { @@ -611,6 +614,15 @@ load_module_file_zlib(const char *filename, size_t *len) gzclose(fp); return data; } +#else +static char * +load_module_file_zlib(const char *filename, size_t *len) +{ + fprintf(stderr, "libvirt-sandbox-init-qemu: %s: " + "zlib support disabled, can't read module %s\n", __func__, filename); + exit_poweroff(); +} +#endif /* WITH_ZLIB */ static char * load_module_file_raw(const char *filename, size_t *len) -- 2.1.4

Daniel P. Berrange

12:51 p.m.

New subject: [libvirt] [sandbox 02/10] Allow disabling zlib support.

On Thu, Jun 25, 2015 at 06:49:39PM +0200, Cédric Bosdonnat wrote:

...

Some distributions may not have static zlib package. Allow disabling it at build time. --- configure.ac | 16 +++++++++++++++- libvirt-sandbox/libvirt-sandbox-init-qemu.c | 12 ++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-)

Cédric Bosdonnat

12:49 p.m.

New subject: [libvirt] [sandbox 03/10] Enable strcmp checks in libvirt-sandbox-init-qemu.c

--- cfg.mk | 2 +- libvirt-sandbox/libvirt-sandbox-init-qemu.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cfg.mk b/cfg.mk index 83ded15..e9c12f7 100644 --- a/cfg.mk +++ b/cfg.mk @@ -133,4 +133,4 @@ exclude_file_name_regexp--sc_bindtextdomain = ^(libvirt-sandbox/tests)|(libvirt- exclude_file_name_regexp--sc_preprocessor_indentation = ^*/*.[ch] -exclude_file_name_regexp--sc_prohibit_strcmp = ^libvirt-sandbox/libvirt-sandbox-init-qemu.c +#exclude_file_name_regexp--sc_prohibit_strcmp = ^libvirt-sandbox/libvirt-sandbox-init-qemu.c diff --git a/libvirt-sandbox/libvirt-sandbox-init-qemu.c b/libvirt-sandbox/libvirt-sandbox-init-qemu.c index a20db77..db67fdb 100644 --- a/libvirt-sandbox/libvirt-sandbox-init-qemu.c +++ b/libvirt-sandbox/libvirt-sandbox-init-qemu.c @@ -51,6 +51,8 @@ #define ATTR_UNUSED __attribute__((__unused__)) +#define STREQ(x,y) (strcmp(x,y) == 0) + static void print_uptime (void); static void insmod (const char *filename); static void set_debug(void); @@ -375,7 +377,7 @@ main(int argc ATTR_UNUSED, char **argv ATTR_UNUSED) if (strncmp(source, "/dev/vd", 7) == 0) create_virtioblk_device(source); - if (strcmp(type, "") == 0) { + if (STREQ(type, "")) { struct stat st; type = NULL; flags |= MS_BIND; @@ -389,7 +391,7 @@ main(int argc ATTR_UNUSED, char **argv ATTR_UNUSED) else mount_mkfile(target, 644); } else { - if (strcmp(type, "tmpfs") == 0) + if (STREQ(type, "tmpfs")) flags |= MS_NOSUID | MS_NODEV; mount_mkdir(target, 0755); -- 2.1.4

Daniel P. Berrange

12:52 p.m.

New subject: [libvirt] [sandbox 03/10] Enable strcmp checks in libvirt-sandbox-init-qemu.c

On Thu, Jun 25, 2015 at 06:49:40PM +0200, Cédric Bosdonnat wrote:

...

--- cfg.mk | 2 +- libvirt-sandbox/libvirt-sandbox-init-qemu.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)

ACK, but...

...

diff --git a/cfg.mk b/cfg.mk index 83ded15..e9c12f7 100644 --- a/cfg.mk +++ b/cfg.mk @@ -133,4 +133,4 @@ exclude_file_name_regexp--sc_bindtextdomain = ^(libvirt-sandbox/tests)|(libvirt-

exclude_file_name_regexp--sc_preprocessor_indentation = ^*/*.[ch]

-exclude_file_name_regexp--sc_prohibit_strcmp = ^libvirt-sandbox/libvirt-sandbox-init-qemu.c +#exclude_file_name_regexp--sc_prohibit_strcmp = ^libvirt-sandbox/libvirt-sandbox-init-qemu.c

You could just delete this instead of commenting it out Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

Cédric Bosdonnat

12:49 p.m.

New subject: [libvirt] [sandbox 04/10] Copy init-common and all its deps to config subdir

In order to be able to mount a custom host-image as / we need to be able to access libvirt-sandbox-init-common and all its needed dependencies. They are now copied into SANDBOXCONFIGDIR /.libs. Hard linking is not possible since we may be working on separate partitions, and symlinks wouldn't help to work with apparmor. Copying makes apparmor happy and solves our problem. --- configure.ac | 7 ++ libvirt-sandbox/libvirt-sandbox-builder-machine.c | 114 ++++++++++++++++++++++ libvirt-sandbox/libvirt-sandbox-init-qemu.c | 5 +- 3 files changed, 124 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 99d22d7..608f56b 100644 --- a/configure.ac +++ b/configure.ac @@ -109,6 +109,13 @@ LIBVIRT_SANDBOX_SELINUX LIBVIRT_SANDBOX_STATIC_LIBC +dnl search for LDD path +AC_PATH_PROG([LDD_PATH], [ldd]) +if test -z "$LDD_PATH"; then + AC_MSG_ERROR([Failed to find ldd.]) +fi +AC_DEFINE_UNQUOTED([LDD_PATH], "$LDD_PATH", [path to ldd binary]) + GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_REQUIRED]) dnl Should be in m4/virt-gettext.m4 but intltoolize is too diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c index 17a2afe..7a2af83 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c @@ -358,6 +358,81 @@ static gboolean gvir_sandbox_builder_machine_write_mount_cfg(GVirSandboxConfig * return ret; } +static gboolean gvir_sandbox_builder_machine_copy_lib(const char *path, + const char *libsdir, + GError **error) +{ + gchar *name = g_path_get_basename(path); + gchar *target = g_build_filename(libsdir, name, NULL); + GFile *srcFile = g_file_new_for_path(path); + GFile *tgtFile = g_file_new_for_path(target); + gboolean result = FALSE; + + + if (!g_file_copy(srcFile, tgtFile, 0, NULL, NULL, NULL, error)) + goto cleanup; + + result = TRUE; + + cleanup: + g_object_unref(tgtFile); + g_object_unref(srcFile); + g_free(target); + g_free(name); + + return result; +} + +static gboolean gvir_sandbox_builder_machine_copy_init(const gchar *statedir, + GError **error) +{ + gchar *libsdir; + const gchar *initPath = LIBEXECDIR "/libvirt-sandbox-init-common"; + gchar *out = NULL; + gchar *line, *tmp; + const gchar *argv[] = {LDD_PATH, initPath, NULL}; + gboolean result = FALSE; + + libsdir = g_build_filename(statedir, "config", ".libs", NULL); + + g_mkdir_with_parents(libsdir, 0755); + + if (!gvir_sandbox_builder_machine_copy_lib(initPath, libsdir, error)) + goto cleanup; + + /* Get all the dependencies to be hard linked */ + if (!g_spawn_sync(NULL, (gchar **)argv, NULL, 0, + NULL, NULL, &out, NULL, NULL, error)) + goto cleanup; + + /* Loop over the output lines to get the path to the libraries to hard link */ + line = out; + while ((tmp = strchr(line, '\n'))) { + gchar *start, *end; + *tmp = '\0'; + + /* Search the line for the library path */ + start = strstr(line, " => "); + end = strstr(line, " ("); + + if (start && end) { + start = start + 4; + *end = '\0'; + + if (!gvir_sandbox_builder_machine_copy_lib(start, libsdir, error)) + goto cleanup; + } + + line = tmp + 1; + } + result = TRUE; + + cleanup: + g_free(libsdir); + g_free(out); + + return result; +} static gboolean gvir_sandbox_builder_machine_construct_domain(GVirSandboxBuilder *builder, GVirSandboxConfig *config, @@ -370,6 +445,9 @@ static gboolean gvir_sandbox_builder_machine_construct_domain(GVirSandboxBuilder error)) return FALSE; + if (!gvir_sandbox_builder_machine_copy_init(statedir, error)) + return FALSE; + if (!GVIR_SANDBOX_BUILDER_CLASS(gvir_sandbox_builder_machine_parent_class)-> construct_domain(builder, config, statedir, domain, error)) return FALSE; @@ -712,12 +790,48 @@ static gboolean gvir_sandbox_builder_machine_clean_post_stop(GVirSandboxBuilder GError **error) { gchar *mntfile = g_strdup_printf("%s/config/mounts.cfg", statedir); + gchar *libsdir = g_build_filename(statedir, "config", ".libs", NULL); + GFile *libsFile = g_file_new_for_path(libsdir); + GFileEnumerator *enumerator = NULL; + GFileInfo *info = NULL; + GFile *child = NULL; gboolean ret = TRUE; if (unlink(mntfile) < 0 && errno != ENOENT) ret = FALSE; + if (!(enumerator = g_file_enumerate_children(libsFile, "*", G_FILE_QUERY_INFO_NONE, + NULL, error)) && + (*error)->code != G_IO_ERROR_NOT_FOUND) { + ret = FALSE; + goto cleanup; + } + + while ((info = g_file_enumerator_next_file(enumerator, NULL, error))) { + child = g_file_enumerator_get_child(enumerator, info); + if (!g_file_delete(child, NULL, error)) + ret = FALSE; + g_object_unref(child); + child = NULL; + g_object_unref(info); + info = NULL; + } + if (!g_file_enumerator_close(enumerator, NULL, error)) + ret = FALSE; + + if (!g_file_delete(libsFile, NULL, error) && + (*error)->code != G_IO_ERROR_NOT_FOUND) + ret = FALSE; + + cleanup: + if (child) + g_object_unref(child); + if (info) + g_object_unref(info); + g_object_unref(enumerator); + g_object_unref(libsFile); + g_free(libsdir); g_free(mntfile); return ret; } diff --git a/libvirt-sandbox/libvirt-sandbox-init-qemu.c b/libvirt-sandbox/libvirt-sandbox-init-qemu.c index db67fdb..45cb9b3 100644 --- a/libvirt-sandbox/libvirt-sandbox-init-qemu.c +++ b/libvirt-sandbox/libvirt-sandbox-init-qemu.c @@ -230,6 +230,7 @@ int main(int argc ATTR_UNUSED, char **argv ATTR_UNUSED) { const char *args[50]; + const char *env[] = {"LD_LIBRARY_PATH=" SANDBOXCONFIGDIR "/.libs", NULL}; int narg = 0; char *strace = NULL; @@ -430,13 +431,13 @@ main(int argc ATTR_UNUSED, char **argv ATTR_UNUSED) args[narg++] = "1000"; } - args[narg++] = LIBEXECDIR "/libvirt-sandbox-init-common"; + args[narg++] = SANDBOXCONFIGDIR "/.libs/libvirt-sandbox-init-common"; if (debug) args[narg++] = "-d"; if (debug) fprintf(stderr, "libvirt-sandbox-init-qemu: Running common init %s\n", args[0]); - execv(args[0], (char**)args); + execve(args[0], (char**)args, (char**)env); fprintf(stderr, "libvirt-sandbox-init-qemu: %s: cannot execute %s: %s\n", __func__, args[0], strerror(errno)); exit_poweroff(); -- 2.1.4

Daniel P. Berrange

26 Jun 26 Jun

12:46 p.m.

New subject: [libvirt] [sandbox 04/10] Copy init-common and all its deps to config subdir

On Thu, Jun 25, 2015 at 06:49:41PM +0200, Cédric Bosdonnat wrote:

...

In order to be able to mount a custom host-image as / we need to be able to access libvirt-sandbox-init-common and all its needed dependencies.

They are now copied into SANDBOXCONFIGDIR /.libs. Hard linking is not possible since we may be working on separate partitions, and symlinks wouldn't help to work with apparmor. Copying makes apparmor happy and solves our problem. --- configure.ac | 7 ++ libvirt-sandbox/libvirt-sandbox-builder-machine.c | 114 ++++++++++++++++++++++ libvirt-sandbox/libvirt-sandbox-init-qemu.c | 5 +- 3 files changed, 124 insertions(+), 2 deletions(-)

Don't we need to change the container builder too ? It will need to be able to run the init-common binary from the real host root FS too IIUC

...

+static gboolean gvir_sandbox_builder_machine_copy_init(const gchar *statedir, + GError **error) +{ + gchar *libsdir; + const gchar *initPath = LIBEXECDIR "/libvirt-sandbox-init-common"; + gchar *out = NULL; + gchar *line, *tmp; + const gchar *argv[] = {LDD_PATH, initPath, NULL}; + gboolean result = FALSE; + + libsdir = g_build_filename(statedir, "config", ".libs", NULL); + + g_mkdir_with_parents(libsdir, 0755); + + if (!gvir_sandbox_builder_machine_copy_lib(initPath, libsdir, error)) + goto cleanup; + + /* Get all the dependencies to be hard linked */ + if (!g_spawn_sync(NULL, (gchar **)argv, NULL, 0, + NULL, NULL, &out, NULL, NULL, error)) + goto cleanup; + + /* Loop over the output lines to get the path to the libraries to hard link */ + line = out; + while ((tmp = strchr(line, '\n'))) { + gchar *start, *end; + *tmp = '\0'; + + /* Search the line for the library path */ + start = strstr(line, " => "); + end = strstr(line, " ("); + + if (start && end) { + start = start + 4; + *end = '\0'; + + if (!gvir_sandbox_builder_machine_copy_lib(start, libsdir, error)) + goto cleanup; + } + + line = tmp + 1; + } + result = TRUE; + + cleanup: + g_free(libsdir); + g_free(out); + + return result; +}

static gboolean gvir_sandbox_builder_machine_construct_domain(GVirSandboxBuilder *builder, GVirSandboxConfig *config, @@ -370,6 +445,9 @@ static gboolean gvir_sandbox_builder_machine_construct_domain(GVirSandboxBuilder error)) return FALSE;

+ if (!gvir_sandbox_builder_machine_copy_init(statedir, error)) + return FALSE; + if (!GVIR_SANDBOX_BUILDER_CLASS(gvir_sandbox_builder_machine_parent_class)-> construct_domain(builder, config, statedir, domain, error)) return FALSE; @@ -712,12 +790,48 @@ static gboolean gvir_sandbox_builder_machine_clean_post_stop(GVirSandboxBuilder GError **error) { gchar *mntfile = g_strdup_printf("%s/config/mounts.cfg", statedir); + gchar *libsdir = g_build_filename(statedir, "config", ".libs", NULL); + GFile *libsFile = g_file_new_for_path(libsdir); + GFileEnumerator *enumerator = NULL; + GFileInfo *info = NULL; + GFile *child = NULL; gboolean ret = TRUE;

if (unlink(mntfile) < 0 && errno != ENOENT) ret = FALSE; + if (!(enumerator = g_file_enumerate_children(libsFile, "*", G_FILE_QUERY_INFO_NONE, + NULL, error)) && + (*error)->code != G_IO_ERROR_NOT_FOUND) { + ret = FALSE; + goto cleanup; + } + + while ((info = g_file_enumerator_next_file(enumerator, NULL, error))) { + child = g_file_enumerator_get_child(enumerator, info); + if (!g_file_delete(child, NULL, error)) + ret = FALSE; + g_object_unref(child); + child = NULL; + g_object_unref(info); + info = NULL; + }

+ if (!g_file_enumerator_close(enumerator, NULL, error)) + ret = FALSE; + + if (!g_file_delete(libsFile, NULL, error) && + (*error)->code != G_IO_ERROR_NOT_FOUND) + ret = FALSE; + + cleanup: + if (child) + g_object_unref(child); + if (info) + g_object_unref(info); + g_object_unref(enumerator); + g_object_unref(libsFile); + g_free(libsdir); g_free(mntfile); return ret; }

Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

Cédric Bosdonnat

25 Jun 25 Jun

12:49 p.m.

New subject: [libvirt] [sandbox 05/10] Remove init-common dependency on libvirt-sandbox.so

Removing this dependency avoids getting all libvirt.so dependencies loaded in our container. --- libvirt-sandbox/Makefile.am | 41 +++++++++++---- libvirt-sandbox/libvirt-sandbox-config-all.h | 61 ++++++++++++++++++++++ .../libvirt-sandbox-config-interactive.c | 2 +- .../libvirt-sandbox-config-mount-file.c | 2 +- .../libvirt-sandbox-config-mount-guest-bind.c | 2 +- .../libvirt-sandbox-config-mount-host-bind.c | 2 +- .../libvirt-sandbox-config-mount-host-image.c | 2 +- libvirt-sandbox/libvirt-sandbox-config-mount-ram.c | 2 +- libvirt-sandbox/libvirt-sandbox-config-mount.c | 2 +- .../libvirt-sandbox-config-network-address.c | 2 +- ...rt-sandbox-config-network-filterref-parameter.c | 2 +- .../libvirt-sandbox-config-network-filterref.c | 2 +- .../libvirt-sandbox-config-network-route.c | 2 +- libvirt-sandbox/libvirt-sandbox-config-network.c | 2 +- .../libvirt-sandbox-config-service-generic.c | 2 +- .../libvirt-sandbox-config-service-systemd.c | 2 +- libvirt-sandbox/libvirt-sandbox-config-service.c | 2 +- libvirt-sandbox/libvirt-sandbox-config.c | 2 +- libvirt-sandbox/libvirt-sandbox-init-common.c | 5 +- libvirt-sandbox/libvirt-sandbox.h | 18 +------ 20 files changed, 111 insertions(+), 46 deletions(-) create mode 100644 libvirt-sandbox/libvirt-sandbox-config-all.h diff --git a/libvirt-sandbox/Makefile.am b/libvirt-sandbox/Makefile.am index 30c9ebf..0e623c5 100644 --- a/libvirt-sandbox/Makefile.am +++ b/libvirt-sandbox/Makefile.am @@ -50,11 +50,9 @@ SANDBOX_RPC_FILES = \ libvirt-sandbox-rpcpacket.h \ $(NULL) -SANDBOX_HEADER_FILES = \ - libvirt-sandbox.h \ - libvirt-sandbox-main.h \ - libvirt-sandbox-util.h \ +SANDBOX_CONFIG_HEADER_FILES = \ libvirt-sandbox-config.h \ + libvirt-sandbox-config-all.h \ libvirt-sandbox-config-network.h \ libvirt-sandbox-config-network-address.h \ libvirt-sandbox-config-network-filterref-parameter.h \ @@ -71,6 +69,12 @@ SANDBOX_HEADER_FILES = \ libvirt-sandbox-config-service.h \ libvirt-sandbox-config-service-systemd.h \ libvirt-sandbox-config-service-generic.h \ + $(NULL) + +SANDBOX_HEADER_FILES = \ + libvirt-sandbox.h \ + libvirt-sandbox-main.h \ + libvirt-sandbox-util.h \ libvirt-sandbox-builder.h \ libvirt-sandbox-builder-initrd.h \ libvirt-sandbox-builder-machine.h \ @@ -81,7 +85,9 @@ SANDBOX_HEADER_FILES = \ libvirt-sandbox-context.h \ libvirt-sandbox-context-interactive.h \ libvirt-sandbox-context-service.h \ + $(SANDBOX_CONFIG_HEADER_FILES) \ $(NULL) + SANDBOX_SOURCE_FILES = \ libvirt-sandbox-main.c \ libvirt-sandbox-config.c \ @@ -166,31 +172,48 @@ libvirt_sandbox_1_0_la_LDFLAGS = \ libvirt_sandbox_init_common_SOURCES = libvirt-sandbox-init-common.c \ $(SANDBOX_GENERATED_RPC_FILES) \ $(SANDBOX_RPC_FILES) \ + $(SANDBOX_CONFIG_HEADER_FILES) \ + libvirt-sandbox-config.c \ + libvirt-sandbox-config-network.c \ + libvirt-sandbox-config-network-address.c \ + libvirt-sandbox-config-network-filterref.c \ + libvirt-sandbox-config-network-filterref-parameter.c \ + libvirt-sandbox-config-network-route.c \ + libvirt-sandbox-config-mount.c \ + libvirt-sandbox-config-mount-file.c \ + libvirt-sandbox-config-mount-host-bind.c \ + libvirt-sandbox-config-mount-host-image.c \ + libvirt-sandbox-config-mount-guest-bind.c \ + libvirt-sandbox-config-mount-ram.c \ + libvirt-sandbox-config-interactive.c \ + libvirt-sandbox-config-service.c \ + libvirt-sandbox-config-service-systemd.c \ + libvirt-sandbox-config-service-generic.c \ $(NULL) libvirt_sandbox_init_common_CFLAGS = \ -DLIBEXECDIR="\"$(libexecdir)\"" \ -DSANDBOXCONFIGDIR="\"$(sandboxconfigdir)\"" \ -DLOCALEDIR="\"$(datadir)/locale"\" \ + -DLIBVIRT_SANDBOX_BUILD \ $(COVERAGE_CFLAGS) \ -I$(top_srcdir) \ -I$(top_builddir) \ + $(LIBVIRT_GCONFIG_CFLAGS) \ $(GIO_UNIX_CFLAGS) \ - $(LIBVIRT_GLIB_CFLAGS) \ - $(LIBVIRT_GOBJECT_CFLAGS) \ $(CAPNG_CFLAGS) \ + $(SELINUX_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) libvirt_sandbox_init_common_LDFLAGS = \ -lutil \ $(COVERAGE_CFLAGS:-f%=-Wc,f%) \ $(GIO_UNIX_LIBS) \ - $(LIBVIRT_GLIB_LIBS) \ - $(LIBVIRT_GOBJECT_LIBS) \ + $(LIBVIRT_GCONFIG_LIBS) \ $(CAPNG_LIBS) \ + $(SELINUX_LIBS) \ $(WARN_CFLAGS) \ $(NULL) libvirt_sandbox_init_common_LDADD = \ - libvirt-sandbox-1.0.la \ $(NULL) libvirt_sandbox_init_lxc_SOURCES = libvirt-sandbox-init-lxc.c diff --git a/libvirt-sandbox/libvirt-sandbox-config-all.h b/libvirt-sandbox/libvirt-sandbox-config-all.h new file mode 100644 index 0000000..9a2d70c --- /dev/null +++ b/libvirt-sandbox/libvirt-sandbox-config-all.h @@ -0,0 +1,61 @@ +/* + * libvirt-sandbox.h: libvirt sandbox integration +[ * + * Copyright (C) 2010 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Daniel P. Berrange <berrange@redhat.com> + */ + +#ifndef __LIBVIRT_SANDBOX_CONFIG_ALL_H__ +#define __LIBVIRT_SANDBOX_CONFIG_ALL_H__ + +/* External include */ +#include <libvirt-gconfig/libvirt-gconfig.h> +#include <glib.h> +#include <glib-object.h> +#include <gio/gio.h> + +/* Local includes */ +#include <libvirt-sandbox/libvirt-sandbox-util.h> +#include <libvirt-sandbox/libvirt-sandbox-config-mount.h> +#include <libvirt-sandbox/libvirt-sandbox-config-mount-file.h> +#include <libvirt-sandbox/libvirt-sandbox-config-mount-host-bind.h> +#include <libvirt-sandbox/libvirt-sandbox-config-mount-host-image.h> +#include <libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.h> +#include <libvirt-sandbox/libvirt-sandbox-config-mount-ram.h> +#include <libvirt-sandbox/libvirt-sandbox-config-network-address.h> +#include <libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.h> +#include <libvirt-sandbox/libvirt-sandbox-config-network-filterref.h> +#include <libvirt-sandbox/libvirt-sandbox-config-network-route.h> +#include <libvirt-sandbox/libvirt-sandbox-config-network.h> +#include <libvirt-sandbox/libvirt-sandbox-config.h> +#include <libvirt-sandbox/libvirt-sandbox-config-initrd.h> +#include <libvirt-sandbox/libvirt-sandbox-config-interactive.h> +#include <libvirt-sandbox/libvirt-sandbox-config-service.h> +#include <libvirt-sandbox/libvirt-sandbox-config-service-systemd.h> +#include <libvirt-sandbox/libvirt-sandbox-config-service-generic.h> + +#endif /* __LIBVIRT_SANDBOX_CONFIG_ALL_H__ */ + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * indent-tabs-mode: nil + * tab-width: 8 + * End: + */ diff --git a/libvirt-sandbox/libvirt-sandbox-config-interactive.c b/libvirt-sandbox/libvirt-sandbox-config-interactive.c index 82d9431..27b4c16 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-interactive.c +++ b/libvirt-sandbox/libvirt-sandbox-config-interactive.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h> -#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h" /** * SECTION: libvirt-sandbox-config-interactive diff --git a/libvirt-sandbox/libvirt-sandbox-config-mount-file.c b/libvirt-sandbox/libvirt-sandbox-config-mount-file.c index d6a3122..e53929f 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-mount-file.c +++ b/libvirt-sandbox/libvirt-sandbox-config-mount-file.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h> -#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h" /** * SECTION: libvirt-sandbox-config-mount-file diff --git a/libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.c b/libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.c index 5b3b87f..061f625 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.c +++ b/libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h> -#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h" /** * SECTION: libvirt-sandbox-config-mount-guest-bind diff --git a/libvirt-sandbox/libvirt-sandbox-config-mount-host-bind.c b/libvirt-sandbox/libvirt-sandbox-config-mount-host-bind.c index d65f51f..c0c911b 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-mount-host-bind.c +++ b/libvirt-sandbox/libvirt-sandbox-config-mount-host-bind.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h> -#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h" /** * SECTION: libvirt-sandbox-config-mount-host-bind diff --git a/libvirt-sandbox/libvirt-sandbox-config-mount-host-image.c b/libvirt-sandbox/libvirt-sandbox-config-mount-host-image.c index 37573ef..cf7ce49 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-mount-host-image.c +++ b/libvirt-sandbox/libvirt-sandbox-config-mount-host-image.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h> -#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h" /** * SECTION: libvirt-sandbox-config-mount-image diff --git a/libvirt-sandbox/libvirt-sandbox-config-mount-ram.c b/libvirt-sandbox/libvirt-sandbox-config-mount-ram.c index f4ad6e2..1e0c352 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-mount-ram.c +++ b/libvirt-sandbox/libvirt-sandbox-config-mount-ram.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h> -#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h" /** * SECTION: libvirt-sandbox-config-mount-ram diff --git a/libvirt-sandbox/libvirt-sandbox-config-mount.c b/libvirt-sandbox/libvirt-sandbox-config-mount.c index b84199e..21a8684 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-mount.c +++ b/libvirt-sandbox/libvirt-sandbox-config-mount.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h> -#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h" /** * SECTION: libvirt-sandbox-config-mount diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-address.c b/libvirt-sandbox/libvirt-sandbox-config-network-address.c index b2e58dc..68b0268 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network-address.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network-address.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h> -#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h" /** * SECTION: libvirt-sandbox-config-network_address diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c b/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c index 5086ac6..2807b4f 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h> -#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h" /** * SECTION: libvirt-sandbox-config-network-filterref-parameter diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c b/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c index c0c8e01..1770c0b 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c @@ -24,7 +24,7 @@ #include <config.h> #include <string.h> -#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h" /** * SECTION: libvirt-sandbox-config-network-filterref diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-route.c b/libvirt-sandbox/libvirt-sandbox-config-network-route.c index 311b2e7..1664d18 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network-route.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network-route.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h> -#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h" /** * SECTION: libvirt-sandbox-config-network_route diff --git a/libvirt-sandbox/libvirt-sandbox-config-network.c b/libvirt-sandbox/libvirt-sandbox-config-network.c index 2bb55bf..df21700 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h> -#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h" /** * SECTION: libvirt-sandbox-config-network diff --git a/libvirt-sandbox/libvirt-sandbox-config-service-generic.c b/libvirt-sandbox/libvirt-sandbox-config-service-generic.c index a9e8858..d1118c2 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-service-generic.c +++ b/libvirt-sandbox/libvirt-sandbox-config-service-generic.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h> -#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h" /** * SECTION: libvirt-sandbox-config-service-generic diff --git a/libvirt-sandbox/libvirt-sandbox-config-service-systemd.c b/libvirt-sandbox/libvirt-sandbox-config-service-systemd.c index 8436a25..dc2e4a5 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-service-systemd.c +++ b/libvirt-sandbox/libvirt-sandbox-config-service-systemd.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h> -#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h" /** * SECTION: libvirt-sandbox-config-service-systemd diff --git a/libvirt-sandbox/libvirt-sandbox-config-service.c b/libvirt-sandbox/libvirt-sandbox-config-service.c index a99f42a..388ec63 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-service.c +++ b/libvirt-sandbox/libvirt-sandbox-config-service.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h> -#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h" /** * SECTION: libvirt-sandbox-config-service diff --git a/libvirt-sandbox/libvirt-sandbox-config.c b/libvirt-sandbox/libvirt-sandbox-config.c index fbc65a6..d82076a 100644 --- a/libvirt-sandbox/libvirt-sandbox-config.c +++ b/libvirt-sandbox/libvirt-sandbox-config.c @@ -26,7 +26,7 @@ #include <glib/gi18n.h> -#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h" #include <errno.h> #include <selinux/selinux.h> diff --git a/libvirt-sandbox/libvirt-sandbox-init-common.c b/libvirt-sandbox/libvirt-sandbox-init-common.c index 68f96ba..46464ea 100644 --- a/libvirt-sandbox/libvirt-sandbox-init-common.c +++ b/libvirt-sandbox/libvirt-sandbox-init-common.c @@ -22,7 +22,7 @@ #include <config.h> -#include <libvirt-sandbox/libvirt-sandbox.h> +#include <libvirt-sandbox/libvirt-sandbox-config-all.h> #include <glib/gi18n.h> #include <stdio.h> @@ -1179,9 +1179,6 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } - if (!gvir_sandbox_init_check(&argc, &argv, &error)) - exit(EXIT_FAILURE); - g_set_application_name(_("Libvirt Sandbox Init Common")); context = g_option_context_new (_("- Libvirt Sandbox")); diff --git a/libvirt-sandbox/libvirt-sandbox.h b/libvirt-sandbox/libvirt-sandbox.h index adb21a1..b9de570 100644 --- a/libvirt-sandbox/libvirt-sandbox.h +++ b/libvirt-sandbox/libvirt-sandbox.h @@ -31,23 +31,7 @@ #include <libvirt-sandbox/libvirt-sandbox-main.h> #include <libvirt-sandbox/libvirt-sandbox-util.h> #include <libvirt-sandbox/libvirt-sandbox-enum-types.h> -#include <libvirt-sandbox/libvirt-sandbox-config-mount.h> -#include <libvirt-sandbox/libvirt-sandbox-config-mount-file.h> -#include <libvirt-sandbox/libvirt-sandbox-config-mount-host-bind.h> -#include <libvirt-sandbox/libvirt-sandbox-config-mount-host-image.h> -#include <libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.h> -#include <libvirt-sandbox/libvirt-sandbox-config-mount-ram.h> -#include <libvirt-sandbox/libvirt-sandbox-config-network-address.h> -#include <libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.h> -#include <libvirt-sandbox/libvirt-sandbox-config-network-filterref.h> -#include <libvirt-sandbox/libvirt-sandbox-config-network-route.h> -#include <libvirt-sandbox/libvirt-sandbox-config-network.h> -#include <libvirt-sandbox/libvirt-sandbox-config.h> -#include <libvirt-sandbox/libvirt-sandbox-config-initrd.h> -#include <libvirt-sandbox/libvirt-sandbox-config-interactive.h> -#include <libvirt-sandbox/libvirt-sandbox-config-service.h> -#include <libvirt-sandbox/libvirt-sandbox-config-service-systemd.h> -#include <libvirt-sandbox/libvirt-sandbox-config-service-generic.h> +#include <libvirt-sandbox/libvirt-sandbox-config-all.h> #include <libvirt-sandbox/libvirt-sandbox-builder.h> #include <libvirt-sandbox/libvirt-sandbox-builder-initrd.h> #include <libvirt-sandbox/libvirt-sandbox-builder-machine.h> -- 2.1.4

Daniel P. Berrange

26 Jun 26 Jun

12:36 p.m.

New subject: [libvirt] [sandbox 05/10] Remove init-common dependency on libvirt-sandbox.so

On Thu, Jun 25, 2015 at 06:49:42PM +0200, Cédric Bosdonnat wrote:

...

Removing this dependency avoids getting all libvirt.so dependencies loaded in our container. --- libvirt-sandbox/Makefile.am | 41 +++++++++++---- libvirt-sandbox/libvirt-sandbox-config-all.h | 61 ++++++++++++++++++++++ .../libvirt-sandbox-config-interactive.c | 2 +- .../libvirt-sandbox-config-mount-file.c | 2 +- .../libvirt-sandbox-config-mount-guest-bind.c | 2 +- .../libvirt-sandbox-config-mount-host-bind.c | 2 +- .../libvirt-sandbox-config-mount-host-image.c | 2 +- libvirt-sandbox/libvirt-sandbox-config-mount-ram.c | 2 +- libvirt-sandbox/libvirt-sandbox-config-mount.c | 2 +- .../libvirt-sandbox-config-network-address.c | 2 +- ...rt-sandbox-config-network-filterref-parameter.c | 2 +- .../libvirt-sandbox-config-network-filterref.c | 2 +- .../libvirt-sandbox-config-network-route.c | 2 +- libvirt-sandbox/libvirt-sandbox-config-network.c | 2 +- .../libvirt-sandbox-config-service-generic.c | 2 +- .../libvirt-sandbox-config-service-systemd.c | 2 +- libvirt-sandbox/libvirt-sandbox-config-service.c | 2 +- libvirt-sandbox/libvirt-sandbox-config.c | 2 +- libvirt-sandbox/libvirt-sandbox-init-common.c | 5 +- libvirt-sandbox/libvirt-sandbox.h | 18 +------ 20 files changed, 111 insertions(+), 46 deletions(-) create mode 100644 libvirt-sandbox/libvirt-sandbox-config-all.h

diff --git a/libvirt-sandbox/Makefile.am b/libvirt-sandbox/Makefile.am index 30c9ebf..0e623c5 100644 --- a/libvirt-sandbox/Makefile.am +++ b/libvirt-sandbox/Makefile.am @@ -50,11 +50,9 @@ SANDBOX_RPC_FILES = \ libvirt-sandbox-rpcpacket.h \ $(NULL)

-SANDBOX_HEADER_FILES = \ - libvirt-sandbox.h \ - libvirt-sandbox-main.h \ - libvirt-sandbox-util.h \ +SANDBOX_CONFIG_HEADER_FILES = \ libvirt-sandbox-config.h \ + libvirt-sandbox-config-all.h \

I'd be inclined to *not* add this - merely keep this header file as non-installed.

...

libvirt-sandbox-config-network.h \ libvirt-sandbox-config-network-address.h \ libvirt-sandbox-config-network-filterref-parameter.h \ @@ -71,6 +69,12 @@ SANDBOX_HEADER_FILES = \ libvirt-sandbox-config-service.h \ libvirt-sandbox-config-service-systemd.h \ libvirt-sandbox-config-service-generic.h \ + $(NULL) + +SANDBOX_HEADER_FILES = \ + libvirt-sandbox.h \ + libvirt-sandbox-main.h \ + libvirt-sandbox-util.h \ libvirt-sandbox-builder.h \ libvirt-sandbox-builder-initrd.h \ libvirt-sandbox-builder-machine.h \ @@ -81,7 +85,9 @@ SANDBOX_HEADER_FILES = \ libvirt-sandbox-context.h \ libvirt-sandbox-context-interactive.h \ libvirt-sandbox-context-service.h \ + $(SANDBOX_CONFIG_HEADER_FILES) \ $(NULL) + SANDBOX_SOURCE_FILES = \ libvirt-sandbox-main.c \ libvirt-sandbox-config.c \ @@ -166,31 +172,48 @@ libvirt_sandbox_1_0_la_LDFLAGS = \ libvirt_sandbox_init_common_SOURCES = libvirt-sandbox-init-common.c \ $(SANDBOX_GENERATED_RPC_FILES) \ $(SANDBOX_RPC_FILES) \ + $(SANDBOX_CONFIG_HEADER_FILES) \ + libvirt-sandbox-config.c \ + libvirt-sandbox-config-network.c \ + libvirt-sandbox-config-network-address.c \ + libvirt-sandbox-config-network-filterref.c \ + libvirt-sandbox-config-network-filterref-parameter.c \ + libvirt-sandbox-config-network-route.c \ + libvirt-sandbox-config-mount.c \ + libvirt-sandbox-config-mount-file.c \ + libvirt-sandbox-config-mount-host-bind.c \ + libvirt-sandbox-config-mount-host-image.c \ + libvirt-sandbox-config-mount-guest-bind.c \ + libvirt-sandbox-config-mount-ram.c \ + libvirt-sandbox-config-interactive.c \ + libvirt-sandbox-config-service.c \ + libvirt-sandbox-config-service-systemd.c \ + libvirt-sandbox-config-service-generic.c \

We could useful defined a SANDBOX_CONFIG_SOURCE_FILES rule so we can avoid duplicating the list config source files in two places,

...

$(NULL) libvirt_sandbox_init_common_CFLAGS = \ -DLIBEXECDIR="\"$(libexecdir)\"" \ -DSANDBOXCONFIGDIR="\"$(sandboxconfigdir)\"" \ -DLOCALEDIR="\"$(datadir)/locale"\" \ + -DLIBVIRT_SANDBOX_BUILD \ $(COVERAGE_CFLAGS) \ -I$(top_srcdir) \ -I$(top_builddir) \ + $(LIBVIRT_GCONFIG_CFLAGS) \ $(GIO_UNIX_CFLAGS) \ - $(LIBVIRT_GLIB_CFLAGS) \ - $(LIBVIRT_GOBJECT_CFLAGS) \ $(CAPNG_CFLAGS) \ + $(SELINUX_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) libvirt_sandbox_init_common_LDFLAGS = \ -lutil \ $(COVERAGE_CFLAGS:-f%=-Wc,f%) \ $(GIO_UNIX_LIBS) \ - $(LIBVIRT_GLIB_LIBS) \ - $(LIBVIRT_GOBJECT_LIBS) \ + $(LIBVIRT_GCONFIG_LIBS) \ $(CAPNG_LIBS) \ + $(SELINUX_LIBS) \ $(WARN_CFLAGS) \ $(NULL) libvirt_sandbox_init_common_LDADD = \ - libvirt-sandbox-1.0.la \ $(NULL)

libvirt_sandbox_init_lxc_SOURCES = libvirt-sandbox-init-lxc.c diff --git a/libvirt-sandbox/libvirt-sandbox-config-all.h b/libvirt-sandbox/libvirt-sandbox-config-all.h new file mode 100644 index 0000000..9a2d70c --- /dev/null +++ b/libvirt-sandbox/libvirt-sandbox-config-all.h @@ -0,0 +1,61 @@ +/* + * libvirt-sandbox.h: libvirt sandbox integration +[ * + * Copyright (C) 2010 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Daniel P. Berrange <berrange@redhat.com> + */ + +#ifndef __LIBVIRT_SANDBOX_CONFIG_ALL_H__ +#define __LIBVIRT_SANDBOX_CONFIG_ALL_H__ + +/* External include */ +#include <libvirt-gconfig/libvirt-gconfig.h> +#include <glib.h> +#include <glib-object.h> +#include <gio/gio.h> + +/* Local includes */ +#include <libvirt-sandbox/libvirt-sandbox-util.h> +#include <libvirt-sandbox/libvirt-sandbox-config-mount.h> +#include <libvirt-sandbox/libvirt-sandbox-config-mount-file.h> +#include <libvirt-sandbox/libvirt-sandbox-config-mount-host-bind.h> +#include <libvirt-sandbox/libvirt-sandbox-config-mount-host-image.h> +#include <libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.h> +#include <libvirt-sandbox/libvirt-sandbox-config-mount-ram.h> +#include <libvirt-sandbox/libvirt-sandbox-config-network-address.h> +#include <libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.h> +#include <libvirt-sandbox/libvirt-sandbox-config-network-filterref.h> +#include <libvirt-sandbox/libvirt-sandbox-config-network-route.h> +#include <libvirt-sandbox/libvirt-sandbox-config-network.h> +#include <libvirt-sandbox/libvirt-sandbox-config.h> +#include <libvirt-sandbox/libvirt-sandbox-config-initrd.h> +#include <libvirt-sandbox/libvirt-sandbox-config-interactive.h> +#include <libvirt-sandbox/libvirt-sandbox-config-service.h> +#include <libvirt-sandbox/libvirt-sandbox-config-service-systemd.h> +#include <libvirt-sandbox/libvirt-sandbox-config-service-generic.h> + +#endif /* __LIBVIRT_SANDBOX_CONFIG_ALL_H__ */ + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * indent-tabs-mode: nil + * tab-width: 8 + * End: + */ diff --git a/libvirt-sandbox/libvirt-sandbox-config-interactive.c b/libvirt-sandbox/libvirt-sandbox-config-interactive.c index 82d9431..27b4c16 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-interactive.c +++ b/libvirt-sandbox/libvirt-sandbox-config-interactive.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h>

-#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h"

/** * SECTION: libvirt-sandbox-config-interactive diff --git a/libvirt-sandbox/libvirt-sandbox-config-mount-file.c b/libvirt-sandbox/libvirt-sandbox-config-mount-file.c index d6a3122..e53929f 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-mount-file.c +++ b/libvirt-sandbox/libvirt-sandbox-config-mount-file.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h>

-#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h"

/** * SECTION: libvirt-sandbox-config-mount-file diff --git a/libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.c b/libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.c index 5b3b87f..061f625 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.c +++ b/libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h>

-#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h"

/** * SECTION: libvirt-sandbox-config-mount-guest-bind diff --git a/libvirt-sandbox/libvirt-sandbox-config-mount-host-bind.c b/libvirt-sandbox/libvirt-sandbox-config-mount-host-bind.c index d65f51f..c0c911b 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-mount-host-bind.c +++ b/libvirt-sandbox/libvirt-sandbox-config-mount-host-bind.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h>

-#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h"

/** * SECTION: libvirt-sandbox-config-mount-host-bind diff --git a/libvirt-sandbox/libvirt-sandbox-config-mount-host-image.c b/libvirt-sandbox/libvirt-sandbox-config-mount-host-image.c index 37573ef..cf7ce49 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-mount-host-image.c +++ b/libvirt-sandbox/libvirt-sandbox-config-mount-host-image.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h>

-#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h"

/** * SECTION: libvirt-sandbox-config-mount-image diff --git a/libvirt-sandbox/libvirt-sandbox-config-mount-ram.c b/libvirt-sandbox/libvirt-sandbox-config-mount-ram.c index f4ad6e2..1e0c352 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-mount-ram.c +++ b/libvirt-sandbox/libvirt-sandbox-config-mount-ram.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h>

-#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h"

/** * SECTION: libvirt-sandbox-config-mount-ram diff --git a/libvirt-sandbox/libvirt-sandbox-config-mount.c b/libvirt-sandbox/libvirt-sandbox-config-mount.c index b84199e..21a8684 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-mount.c +++ b/libvirt-sandbox/libvirt-sandbox-config-mount.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h>

-#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h"

/** * SECTION: libvirt-sandbox-config-mount diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-address.c b/libvirt-sandbox/libvirt-sandbox-config-network-address.c index b2e58dc..68b0268 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network-address.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network-address.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h>

-#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h"

/** * SECTION: libvirt-sandbox-config-network_address diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c b/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c index 5086ac6..2807b4f 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h>

-#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h"

/** * SECTION: libvirt-sandbox-config-network-filterref-parameter diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c b/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c index c0c8e01..1770c0b 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c @@ -24,7 +24,7 @@ #include <config.h> #include <string.h>

-#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h"

/** * SECTION: libvirt-sandbox-config-network-filterref diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-route.c b/libvirt-sandbox/libvirt-sandbox-config-network-route.c index 311b2e7..1664d18 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network-route.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network-route.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h>

-#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h"

/** * SECTION: libvirt-sandbox-config-network_route diff --git a/libvirt-sandbox/libvirt-sandbox-config-network.c b/libvirt-sandbox/libvirt-sandbox-config-network.c index 2bb55bf..df21700 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h>

-#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h"

/** * SECTION: libvirt-sandbox-config-network diff --git a/libvirt-sandbox/libvirt-sandbox-config-service-generic.c b/libvirt-sandbox/libvirt-sandbox-config-service-generic.c index a9e8858..d1118c2 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-service-generic.c +++ b/libvirt-sandbox/libvirt-sandbox-config-service-generic.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h>

-#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h"

/** * SECTION: libvirt-sandbox-config-service-generic diff --git a/libvirt-sandbox/libvirt-sandbox-config-service-systemd.c b/libvirt-sandbox/libvirt-sandbox-config-service-systemd.c index 8436a25..dc2e4a5 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-service-systemd.c +++ b/libvirt-sandbox/libvirt-sandbox-config-service-systemd.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h>

-#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h"

/** * SECTION: libvirt-sandbox-config-service-systemd diff --git a/libvirt-sandbox/libvirt-sandbox-config-service.c b/libvirt-sandbox/libvirt-sandbox-config-service.c index a99f42a..388ec63 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-service.c +++ b/libvirt-sandbox/libvirt-sandbox-config-service.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h>

-#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h"

/** * SECTION: libvirt-sandbox-config-service diff --git a/libvirt-sandbox/libvirt-sandbox-config.c b/libvirt-sandbox/libvirt-sandbox-config.c index fbc65a6..d82076a 100644 --- a/libvirt-sandbox/libvirt-sandbox-config.c +++ b/libvirt-sandbox/libvirt-sandbox-config.c @@ -26,7 +26,7 @@

#include <glib/gi18n.h>

-#include "libvirt-sandbox/libvirt-sandbox.h" +#include "libvirt-sandbox/libvirt-sandbox-config-all.h" #include <errno.h> #include <selinux/selinux.h>

diff --git a/libvirt-sandbox/libvirt-sandbox-init-common.c b/libvirt-sandbox/libvirt-sandbox-init-common.c index 68f96ba..46464ea 100644 --- a/libvirt-sandbox/libvirt-sandbox-init-common.c +++ b/libvirt-sandbox/libvirt-sandbox-init-common.c @@ -22,7 +22,7 @@

#include <config.h>

-#include <libvirt-sandbox/libvirt-sandbox.h> +#include <libvirt-sandbox/libvirt-sandbox-config-all.h> #include <glib/gi18n.h>

#include <stdio.h> @@ -1179,9 +1179,6 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); }

- if (!gvir_sandbox_init_check(&argc, &argv, &error)) - exit(EXIT_FAILURE); - g_set_application_name(_("Libvirt Sandbox Init Common"));

context = g_option_context_new (_("- Libvirt Sandbox")); diff --git a/libvirt-sandbox/libvirt-sandbox.h b/libvirt-sandbox/libvirt-sandbox.h index adb21a1..b9de570 100644 --- a/libvirt-sandbox/libvirt-sandbox.h +++ b/libvirt-sandbox/libvirt-sandbox.h @@ -31,23 +31,7 @@ #include <libvirt-sandbox/libvirt-sandbox-main.h> #include <libvirt-sandbox/libvirt-sandbox-util.h> #include <libvirt-sandbox/libvirt-sandbox-enum-types.h> -#include <libvirt-sandbox/libvirt-sandbox-config-mount.h> -#include <libvirt-sandbox/libvirt-sandbox-config-mount-file.h> -#include <libvirt-sandbox/libvirt-sandbox-config-mount-host-bind.h> -#include <libvirt-sandbox/libvirt-sandbox-config-mount-host-image.h> -#include <libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.h> -#include <libvirt-sandbox/libvirt-sandbox-config-mount-ram.h> -#include <libvirt-sandbox/libvirt-sandbox-config-network-address.h> -#include <libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.h> -#include <libvirt-sandbox/libvirt-sandbox-config-network-filterref.h> -#include <libvirt-sandbox/libvirt-sandbox-config-network-route.h> -#include <libvirt-sandbox/libvirt-sandbox-config-network.h> -#include <libvirt-sandbox/libvirt-sandbox-config.h> -#include <libvirt-sandbox/libvirt-sandbox-config-initrd.h> -#include <libvirt-sandbox/libvirt-sandbox-config-interactive.h> -#include <libvirt-sandbox/libvirt-sandbox-config-service.h> -#include <libvirt-sandbox/libvirt-sandbox-config-service-systemd.h> -#include <libvirt-sandbox/libvirt-sandbox-config-service-generic.h> +#include <libvirt-sandbox/libvirt-sandbox-config-all.h>

I'd prefer to not change libvirt-sandbox.h - just keep this libvirt-sandbox-config-all.h file as in-tree only, avoid putting it into /usr/include

...

#include <libvirt-sandbox/libvirt-sandbox-builder.h> #include <libvirt-sandbox/libvirt-sandbox-builder-initrd.h> #include <libvirt-sandbox/libvirt-sandbox-builder-machine.h>

Cédric Bosdonnat

25 Jun 25 Jun

12:49 p.m.

New subject: [libvirt] [sandbox 06/10] init-qemu: extract the mounts.cfg entry mounting code

Create a mount_entry function from the code mounting the entries defined in mounts.cfg in order to be able to reuse that code. This will later be useful to mount a / from mounts.cfg. --- libvirt-sandbox/libvirt-sandbox-init-qemu.c | 68 +++++++++++++++++------------ 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/libvirt-sandbox/libvirt-sandbox-init-qemu.c b/libvirt-sandbox/libvirt-sandbox-init-qemu.c index 45cb9b3..9acea5f 100644 --- a/libvirt-sandbox/libvirt-sandbox-init-qemu.c +++ b/libvirt-sandbox/libvirt-sandbox-init-qemu.c @@ -226,6 +226,44 @@ create_virtioblk_device(const char *dev) } } +static void +mount_entry(const char *source, + const char *target, + const char *type, + const char * opts) +{ + int flags = 0; + + if (strncmp(source, "/dev/vd", 7) == 0) + create_virtioblk_device(source); + + if (STREQ(type, "")) { + struct stat st; + type = NULL; + flags |= MS_BIND; + if (stat(source, &st) < 0) { + fprintf(stderr, "libvirt-sandbox-init-qemu: %s: cannot read mount source %s: %s\n", + __func__, source, strerror(errno)); + exit_poweroff(); + } + if (S_ISDIR(st.st_mode)) + mount_mkdir(target, 755); + else + mount_mkfile(target, 644); + } else { + if (STREQ(type, "tmpfs")) + flags |= MS_NOSUID | MS_NODEV; + + mount_mkdir(target, 0755); + } + + if (mount(source, target, type, flags, opts) < 0) { + fprintf(stderr, "libvirt-sandbox-init-qemu: %s: cannot mount %s on %s (%s, %s): %s\n", + __func__, source, target, type, opts, strerror(errno)); + exit_poweroff(); + } +} + int main(int argc ATTR_UNUSED, char **argv ATTR_UNUSED) { @@ -369,40 +407,12 @@ main(int argc ATTR_UNUSED, char **argv ATTR_UNUSED) opts++; char *tmp = strchr(opts, '\n'); *tmp = '\0'; - int flags = 0; if (debug) fprintf(stderr, "libvirt-sandbox-init-qemu: %s: %s -> %s (%s, %s)\n", __func__, source, target, type, opts); - if (strncmp(source, "/dev/vd", 7) == 0) - create_virtioblk_device(source); - - if (STREQ(type, "")) { - struct stat st; - type = NULL; - flags |= MS_BIND; - if (stat(source, &st) < 0) { - fprintf(stderr, "libvirt-sandbox-init-qemu: %s: cannot read mount source %s: %s\n", - __func__, source, strerror(errno)); - exit_poweroff(); - } - if (S_ISDIR(st.st_mode)) - mount_mkdir(target, 755); - else - mount_mkfile(target, 644); - } else { - if (STREQ(type, "tmpfs")) - flags |= MS_NOSUID | MS_NODEV; - - mount_mkdir(target, 0755); - } - - if (mount(source, target, type, flags, opts) < 0) { - fprintf(stderr, "libvirt-sandbox-init-qemu: %s: cannot mount %s on %s (%s, %s): %s\n", - __func__, source, target, type, opts, strerror(errno)); - exit_poweroff(); - } + mount_entry(source, target, type, opts); } fclose(fp); -- 2.1.4

Daniel P. Berrange

26 Jun 26 Jun

12:39 p.m.

New subject: [libvirt] [sandbox 06/10] init-qemu: extract the mounts.cfg entry mounting code

On Thu, Jun 25, 2015 at 06:49:43PM +0200, Cédric Bosdonnat wrote:

...

Create a mount_entry function from the code mounting the entries defined in mounts.cfg in order to be able to reuse that code. This will later be useful to mount a / from mounts.cfg. --- libvirt-sandbox/libvirt-sandbox-init-qemu.c | 68 +++++++++++++++++------------ 1 file changed, 39 insertions(+), 29 deletions(-)

Cédric Bosdonnat

25 Jun 25 Jun

12:49 p.m.

New subject: [libvirt] [sandbox 07/10] qemu: use mounts targeting / as root

So far a mount with / as target doesn't change anything: the host / is still the one mounted as /. libvirt-sandbox-init-qemu now detects the presence of a / target in mounts.cfg and mounts it instead of sandbox:root. --- libvirt-sandbox/libvirt-sandbox-init-qemu.c | 69 ++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/libvirt-sandbox/libvirt-sandbox-init-qemu.c b/libvirt-sandbox/libvirt-sandbox-init-qemu.c index 9acea5f..02fb980 100644 --- a/libvirt-sandbox/libvirt-sandbox-init-qemu.c +++ b/libvirt-sandbox/libvirt-sandbox-init-qemu.c @@ -264,6 +264,70 @@ mount_entry(const char *source, } } +static void +mount_root(const char *path) +{ + int foundRoot = 0; + + /* Loop over mounts.cfg to see if we have a candidate for / */ + mount_mkdir(SANDBOXCONFIGDIR, 0755); + mount_9pfs("sandbox:config", SANDBOXCONFIGDIR, 0755, 1); + + FILE *fp = fopen(SANDBOXCONFIGDIR "/mounts.cfg", "r"); + while (fgets(line, sizeof line, fp) && !foundRoot) { + char *source = line; + char *target = strchr(source, '\t'); + *target = '\0'; + target++; + char *type = strchr(target, '\t'); + *type = '\0'; + type++; + char *opts = strchr(type, '\t'); + *opts = '\0'; + opts++; + char *tmp = strchr(opts, '\n'); + *tmp = '\0'; + + if (STREQ(target, "/")) { + int needsDev = strncmp(source, "/dev/", 5) == 0; + + if (debug) + fprintf(stderr, "libvirt-sandbox-init-qemu: found root from %s\n", + source); + + /* In this case, we need to have a /dev before the chroot */ + if (needsDev) { + mount_other("/proc", "proc", 0755); + mount_other("/dev", "tmpfs", 0755); + } + + mount_entry(source, path, type, opts); + + if (needsDev && umount("/dev") < 0) { + fprintf(stderr, + "libvirt-sandbox-init-qemu: %s: " + "cannot unmount temporary /dev: %s\n", + __func__, strerror(errno)); + exit_poweroff(); + } + foundRoot = 1; + } + } + fclose(fp); + + if (umount(SANDBOXCONFIGDIR) < 0) { + fprintf(stderr, + "libvirt-sandbox-init-qemu: %s: " + "cannot unmount temporary %s: %s\n", + __func__, SANDBOXCONFIGDIR, strerror(errno)); + exit_poweroff(); + } + + /* If we couldn't get a / in the mounts, then use the host one */ + if (!foundRoot) + mount_9pfs("sandbox:root", path, 0755, 1); +} + int main(int argc ATTR_UNUSED, char **argv ATTR_UNUSED) { @@ -308,7 +372,7 @@ main(int argc ATTR_UNUSED, char **argv ATTR_UNUSED) if (debug) fprintf(stderr, "libvirt-sandbox-init-qemu: mounting new root on /tmproot\n"); - mount_9pfs("sandbox:root", "/tmproot", 0755, 1); + mount_root("/tmproot"); /* Note that pivot_root won't work. See the note in * Documentation/filesystems/ramfs-rootfs-initramfs.txt @@ -412,7 +476,8 @@ main(int argc ATTR_UNUSED, char **argv ATTR_UNUSED) fprintf(stderr, "libvirt-sandbox-init-qemu: %s: %s -> %s (%s, %s)\n", __func__, source, target, type, opts); - mount_entry(source, target, type, opts); + if (STREQ(target, "/")) + mount_entry(source, target, type, opts); } fclose(fp); -- 2.1.4

Daniel P. Berrange

26 Jun 26 Jun

12:42 p.m.

New subject: [libvirt] [sandbox 07/10] qemu: use mounts targeting / as root

On Thu, Jun 25, 2015 at 06:49:44PM +0200, Cédric Bosdonnat wrote:

...

So far a mount with / as target doesn't change anything: the host / is still the one mounted as /. libvirt-sandbox-init-qemu now detects the presence of a / target in mounts.cfg and mounts it instead of sandbox:root. --- libvirt-sandbox/libvirt-sandbox-init-qemu.c | 69 ++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 2 deletions(-)

diff --git a/libvirt-sandbox/libvirt-sandbox-init-qemu.c b/libvirt-sandbox/libvirt-sandbox-init-qemu.c index 9acea5f..02fb980 100644 --- a/libvirt-sandbox/libvirt-sandbox-init-qemu.c +++ b/libvirt-sandbox/libvirt-sandbox-init-qemu.c @@ -264,6 +264,70 @@ mount_entry(const char *source, } }

+static void +mount_root(const char *path) +{ + int foundRoot = 0; + + /* Loop over mounts.cfg to see if we have a candidate for / */ + mount_mkdir(SANDBOXCONFIGDIR, 0755); + mount_9pfs("sandbox:config", SANDBOXCONFIGDIR, 0755, 1); + + FILE *fp = fopen(SANDBOXCONFIGDIR "/mounts.cfg", "r"); + while (fgets(line, sizeof line, fp) && !foundRoot) { + char *source = line; + char *target = strchr(source, '\t'); + *target = '\0'; + target++; + char *type = strchr(target, '\t'); + *type = '\0'; + type++; + char *opts = strchr(type, '\t'); + *opts = '\0'; + opts++; + char *tmp = strchr(opts, '\n'); + *tmp = '\0'; + + if (STREQ(target, "/")) { + int needsDev = strncmp(source, "/dev/", 5) == 0; + + if (debug) + fprintf(stderr, "libvirt-sandbox-init-qemu: found root from %s\n", + source); + + /* In this case, we need to have a /dev before the chroot */ + if (needsDev) { + mount_other("/proc", "proc", 0755); + mount_other("/dev", "tmpfs", 0755);

Should this be 'devtmpfs' instead of just 'tmpfs' now ?

...

+ } + + mount_entry(source, path, type, opts); + + if (needsDev && umount("/dev") < 0) { + fprintf(stderr, + "libvirt-sandbox-init-qemu: %s: " + "cannot unmount temporary /dev: %s\n", + __func__, strerror(errno)); + exit_poweroff(); + }

Do we need to unmount the temporary /proc too, to just avoid polluting /proc/mounts with multiple instances of it

...

+ foundRoot = 1; + } + } + fclose(fp); + + if (umount(SANDBOXCONFIGDIR) < 0) { + fprintf(stderr, + "libvirt-sandbox-init-qemu: %s: " + "cannot unmount temporary %s: %s\n", + __func__, SANDBOXCONFIGDIR, strerror(errno)); + exit_poweroff(); + } + + /* If we couldn't get a / in the mounts, then use the host one */ + if (!foundRoot) + mount_9pfs("sandbox:root", path, 0755, 1); +} + int main(int argc ATTR_UNUSED, char **argv ATTR_UNUSED) { @@ -308,7 +372,7 @@ main(int argc ATTR_UNUSED, char **argv ATTR_UNUSED) if (debug) fprintf(stderr, "libvirt-sandbox-init-qemu: mounting new root on /tmproot\n");

- mount_9pfs("sandbox:root", "/tmproot", 0755, 1); + mount_root("/tmproot");

/* Note that pivot_root won't work. See the note in * Documentation/filesystems/ramfs-rootfs-initramfs.txt @@ -412,7 +476,8 @@ main(int argc ATTR_UNUSED, char **argv ATTR_UNUSED) fprintf(stderr, "libvirt-sandbox-init-qemu: %s: %s -> %s (%s, %s)\n", __func__, source, target, type, opts);

- mount_entry(source, target, type, opts); + if (STREQ(target, "/"))

Shouldn't this be inverted, ie STRNEQ instead of STREQ - ie we need to skip '/'

...

+ mount_entry(source, target, type, opts); } fclose(fp);

Cédric Bosdonnat

25 Jun 25 Jun

12:49 p.m.

New subject: [libvirt] [sandbox 08/10] Add function to check if there is a mount with / target

gvir_sandbox_config_has_root_mount is a convenience function to check if there is a mount with target '/' --- libvirt-sandbox/libvirt-sandbox-config.c | 21 +++++++++++++++++++++ libvirt-sandbox/libvirt-sandbox-config.h | 1 + libvirt-sandbox/libvirt-sandbox.sym | 1 + 3 files changed, 23 insertions(+) diff --git a/libvirt-sandbox/libvirt-sandbox-config.c b/libvirt-sandbox/libvirt-sandbox-config.c index d82076a..c467ca8 100644 --- a/libvirt-sandbox/libvirt-sandbox-config.c +++ b/libvirt-sandbox/libvirt-sandbox-config.c @@ -1389,6 +1389,27 @@ gboolean gvir_sandbox_config_has_mounts_with_type(GVirSandboxConfig *config, } +gboolean gvir_sandbox_config_has_root_mount(GVirSandboxConfig *config) +{ + GList *tmp = NULL, *mounts = NULL; + gboolean hasRoot = FALSE; + + tmp = mounts = gvir_sandbox_config_get_mounts(config); + while (tmp && !hasRoot) { + const gchar *target; + GVirSandboxConfigMount *mount = GVIR_SANDBOX_CONFIG_MOUNT(tmp->data); + target = gvir_sandbox_config_mount_get_target(mount); + if (g_str_equal(target, "/")) + hasRoot = TRUE; + tmp = tmp->next; + } + g_list_foreach(mounts, (GFunc)g_object_unref, NULL); + g_list_free(mounts); + + return hasRoot; +} + + /** diff --git a/libvirt-sandbox/libvirt-sandbox-config.h b/libvirt-sandbox/libvirt-sandbox-config.h index 1a65e3d..0a9ef3b 100644 --- a/libvirt-sandbox/libvirt-sandbox-config.h +++ b/libvirt-sandbox/libvirt-sandbox-config.h @@ -139,6 +139,7 @@ gboolean gvir_sandbox_config_add_mount_strv(GVirSandboxConfig *config, gboolean gvir_sandbox_config_has_mounts(GVirSandboxConfig *config); gboolean gvir_sandbox_config_has_mounts_with_type(GVirSandboxConfig *config, GType type); +gboolean gvir_sandbox_config_has_root_mount(GVirSandboxConfig *config); gboolean gvir_sandbox_config_add_host_include_strv(GVirSandboxConfig *config, gchar **includes, diff --git a/libvirt-sandbox/libvirt-sandbox.sym b/libvirt-sandbox/libvirt-sandbox.sym index a17dfed..dba4068 100644 --- a/libvirt-sandbox/libvirt-sandbox.sym +++ b/libvirt-sandbox/libvirt-sandbox.sym @@ -212,5 +212,6 @@ LIBVIRT_SANDBOX_0.2.1 { LIBVIRT_SANDBOX_0.5.2 { global: + gvir_sandbox_config_has_root_mount; gvir_sandbox_config_mount_guest_bind_get_format; } LIBVIRT_SANDBOX_0.2.1; -- 2.1.4

Daniel P. Berrange

26 Jun 26 Jun

12:43 p.m.

New subject: [libvirt] [sandbox 08/10] Add function to check if there is a mount with / target

On Thu, Jun 25, 2015 at 06:49:45PM +0200, Cédric Bosdonnat wrote:

...

gvir_sandbox_config_has_root_mount is a convenience function to check if there is a mount with target '/' --- libvirt-sandbox/libvirt-sandbox-config.c | 21 +++++++++++++++++++++ libvirt-sandbox/libvirt-sandbox-config.h | 1 + libvirt-sandbox/libvirt-sandbox.sym | 1 + 3 files changed, 23 insertions(+)

ACK but you'll need to resolve .sym file change

...

diff --git a/libvirt-sandbox/libvirt-sandbox.sym b/libvirt-sandbox/libvirt-sandbox.sym index a17dfed..dba4068 100644 --- a/libvirt-sandbox/libvirt-sandbox.sym +++ b/libvirt-sandbox/libvirt-sandbox.sym @@ -212,5 +212,6 @@ LIBVIRT_SANDBOX_0.2.1 {

LIBVIRT_SANDBOX_0.5.2 { global: + gvir_sandbox_config_has_root_mount; gvir_sandbox_config_mount_guest_bind_get_format; } LIBVIRT_SANDBOX_0.2.1;

Cédric Bosdonnat

25 Jun 25 Jun

12:49 p.m.

New subject: [libvirt] [sandbox 09/10] Don't add sandbox:root device if we have a mount targetting /

There is no need to expose the host file system if the user defined a mount targetting / --- libvirt-sandbox/libvirt-sandbox-builder-machine.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c index 7a2af83..cd459ac 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c @@ -590,17 +590,19 @@ static gboolean gvir_sandbox_builder_machine_construct_devices(GVirSandboxBuilde construct_devices(builder, config, statedir, domain, error)) goto cleanup; - fs = gvir_config_domain_filesys_new(); - gvir_config_domain_filesys_set_type(fs, GVIR_CONFIG_DOMAIN_FILESYS_MOUNT); - gvir_config_domain_filesys_set_access_type(fs, GVIR_CONFIG_DOMAIN_FILESYS_ACCESS_SQUASH); - gvir_config_domain_filesys_set_source(fs, - gvir_sandbox_config_get_root(config)); - gvir_config_domain_filesys_set_target(fs, "sandbox:root"); - gvir_config_domain_filesys_set_readonly(fs, TRUE); + if (!gvir_sandbox_config_has_root_mount(config)) { + fs = gvir_config_domain_filesys_new(); + gvir_config_domain_filesys_set_type(fs, GVIR_CONFIG_DOMAIN_FILESYS_MOUNT); + gvir_config_domain_filesys_set_access_type(fs, GVIR_CONFIG_DOMAIN_FILESYS_ACCESS_SQUASH); + gvir_config_domain_filesys_set_source(fs, + gvir_sandbox_config_get_root(config)); + gvir_config_domain_filesys_set_target(fs, "sandbox:root"); + gvir_config_domain_filesys_set_readonly(fs, TRUE); - gvir_config_domain_add_device(domain, - GVIR_CONFIG_DOMAIN_DEVICE(fs)); - g_object_unref(fs); + gvir_config_domain_add_device(domain, + GVIR_CONFIG_DOMAIN_DEVICE(fs)); + g_object_unref(fs); + } fs = gvir_config_domain_filesys_new(); -- 2.1.4

Daniel P. Berrange

26 Jun 26 Jun

12:43 p.m.

New subject: [libvirt] [sandbox 09/10] Don't add sandbox:root device if we have a mount targetting /

On Thu, Jun 25, 2015 at 06:49:46PM +0200, Cédric Bosdonnat wrote:

...

There is no need to expose the host file system if the user defined a mount targetting / --- libvirt-sandbox/libvirt-sandbox-builder-machine.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)

Cédric Bosdonnat

25 Jun 25 Jun

12:49 p.m.

New subject: [libvirt] [sandbox 10/10] container builder: don't expose host rootfs if unneeded

If the user defined a mount targeting / don't add the host / as mount to /. --- .../libvirt-sandbox-builder-container.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/libvirt-sandbox/libvirt-sandbox-builder-container.c b/libvirt-sandbox/libvirt-sandbox-builder-container.c index bd29c87..8315ab5 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-container.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-container.c @@ -225,17 +225,19 @@ static gboolean gvir_sandbox_builder_container_construct_devices(GVirSandboxBuil construct_devices(builder, config, statedir, domain, error)) goto cleanup; - fs = gvir_config_domain_filesys_new(); - gvir_config_domain_filesys_set_type(fs, GVIR_CONFIG_DOMAIN_FILESYS_MOUNT); - gvir_config_domain_filesys_set_access_type(fs, GVIR_CONFIG_DOMAIN_FILESYS_ACCESS_PASSTHROUGH); - gvir_config_domain_filesys_set_source(fs, - gvir_sandbox_config_get_root(config)); - gvir_config_domain_filesys_set_target(fs, "/"); - gvir_config_domain_filesys_set_readonly(fs, TRUE); + if (!gvir_sandbox_config_has_root_mount(config)) { + fs = gvir_config_domain_filesys_new(); + gvir_config_domain_filesys_set_type(fs, GVIR_CONFIG_DOMAIN_FILESYS_MOUNT); + gvir_config_domain_filesys_set_access_type(fs, GVIR_CONFIG_DOMAIN_FILESYS_ACCESS_PASSTHROUGH); + gvir_config_domain_filesys_set_source(fs, + gvir_sandbox_config_get_root(config)); + gvir_config_domain_filesys_set_target(fs, "/"); + gvir_config_domain_filesys_set_readonly(fs, TRUE); - gvir_config_domain_add_device(domain, - GVIR_CONFIG_DOMAIN_DEVICE(fs)); - g_object_unref(fs); + gvir_config_domain_add_device(domain, + GVIR_CONFIG_DOMAIN_DEVICE(fs)); + g_object_unref(fs); + } -- 2.1.4

Daniel P. Berrange

26 Jun 26 Jun

12:43 p.m.

New subject: [libvirt] [sandbox 10/10] container builder: don't expose host rootfs if unneeded

On Thu, Jun 25, 2015 at 06:49:47PM +0200, Cédric Bosdonnat wrote:

...

If the user defined a mount targeting / don't add the host / as mount to /. --- .../libvirt-sandbox-builder-container.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)

3728

Age (days ago)

3729

Last active (days ago)

List overview

Download

20 comments

2 participants

participants (2)

Cédric Bosdonnat
Daniel P. Berrange

[libvirt] [sandbox 00/10] Actually use host-image mounts on /

tags

participants (2)