100 lines
3.3 KiB
Diff
100 lines
3.3 KiB
Diff
|
From 5253749232749adb535d9b2bf7d43173b191ebef Mon Sep 17 00:00:00 2001
|
||
|
|
From: Florian Weimer <fweimer@redhat.com>
|
||
|
|
Date: Mon, 4 Sep 2017 11:44:10 +0200
|
||
|
|
Subject: [PATCH 21] Synchronize support/ infrastructure with master
|
||
|
|
|
||
|
|
This commit updates the support/ subdirectory to
|
||
|
|
commit 65329bd233db9d1b8b94e90734a564705b619260
|
||
|
|
on the master branch.
|
||
|
|
---
|
||
|
|
support/namespace.h | 11 ++++++++---
|
||
|
|
support/support_chroot.c | 32 +++++++++++++++++++++++---------
|
||
|
|
2 files changed, 31 insertions(+), 12 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/support/namespace.h b/support/namespace.h
|
||
|
|
index 859c2fda3f..9eddb1a0e9 100644
|
||
|
|
--- a/support/namespace.h
|
||
|
|
+++ b/support/namespace.h
|
||
|
|
@@ -66,7 +66,9 @@ struct support_chroot_configuration
|
||
|
|
{
|
||
|
|
/* File contents. The files are not created if the field is
|
||
|
|
NULL. */
|
||
|
|
- const char *resolv_conf;
|
||
|
|
+ const char *resolv_conf; /* /etc/resolv.conf. */
|
||
|
|
+ const char *hosts; /* /etc/hosts. */
|
||
|
|
+ const char *host_conf; /* /etc/host.conf. */
|
||
|
|
};
|
||
|
|
|
||
|
|
/* The result of the creation of a chroot. */
|
||
|
|
@@ -78,8 +80,11 @@ struct support_chroot
|
||
|
|
/* Path to the chroot directory. */
|
||
|
|
char *path_chroot;
|
||
|
|
|
||
|
|
- /* Path to the /etc/resolv.conf file. */
|
||
|
|
- char *path_resolv_conf;
|
||
|
|
+ /* Paths to files in the chroot. These are absolute and outside of
|
||
|
|
+ the chroot. */
|
||
|
|
+ char *path_resolv_conf; /* /etc/resolv.conf. */
|
||
|
|
+ char *path_hosts; /* /etc/hosts. */
|
||
|
|
+ char *path_host_conf; /* /etc/host.conf. */
|
||
|
|
};
|
||
|
|
|
||
|
|
/* Create a chroot environment. The returned data should be freed
|
||
|
|
diff --git a/support/support_chroot.c b/support/support_chroot.c
|
||
|
|
index c0807b313a..f3ef551b05 100644
|
||
|
|
--- a/support/support_chroot.c
|
||
|
|
+++ b/support/support_chroot.c
|
||
|
|
@@ -24,6 +24,23 @@
|
||
|
|
#include <support/test-driver.h>
|
||
|
|
#include <support/xunistd.h>
|
||
|
|
|
||
|
|
+/* If CONTENTS is not NULL, write it to the file at DIRECTORY/RELPATH,
|
||
|
|
+ and store the name in *ABSPATH. If CONTENTS is NULL, store NULL in
|
||
|
|
+ *ABSPATH. */
|
||
|
|
+static void
|
||
|
|
+write_file (const char *directory, const char *relpath, const char *contents,
|
||
|
|
+ char **abspath)
|
||
|
|
+{
|
||
|
|
+ if (contents != NULL)
|
||
|
|
+ {
|
||
|
|
+ *abspath = xasprintf ("%s/%s", directory, relpath);
|
||
|
|
+ add_temp_file (*abspath);
|
||
|
|
+ support_write_file_string (*abspath, contents);
|
||
|
|
+ }
|
||
|
|
+ else
|
||
|
|
+ *abspath = NULL;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
struct support_chroot *
|
||
|
|
support_chroot_create (struct support_chroot_configuration conf)
|
||
|
|
{
|
||
|
|
@@ -39,15 +56,10 @@ support_chroot_create (struct support_chroot_configuration conf)
|
||
|
|
xmkdir (path_etc, 0777);
|
||
|
|
add_temp_file (path_etc);
|
||
|
|
|
||
|
|
- if (conf.resolv_conf != NULL)
|
||
|
|
- {
|
||
|
|
- /* Create an empty resolv.conf file. */
|
||
|
|
- chroot->path_resolv_conf = xasprintf ("%s/resolv.conf", path_etc);
|
||
|
|
- add_temp_file (chroot->path_resolv_conf);
|
||
|
|
- support_write_file_string (chroot->path_resolv_conf, conf.resolv_conf);
|
||
|
|
- }
|
||
|
|
- else
|
||
|
|
- chroot->path_resolv_conf = NULL;
|
||
|
|
+ write_file (path_etc, "resolv.conf", conf.resolv_conf,
|
||
|
|
+ &chroot->path_resolv_conf);
|
||
|
|
+ write_file (path_etc, "hosts", conf.hosts, &chroot->path_hosts);
|
||
|
|
+ write_file (path_etc, "host.conf", conf.host_conf, &chroot->path_host_conf);
|
||
|
|
|
||
|
|
free (path_etc);
|
||
|
|
|
||
|
|
@@ -67,5 +79,7 @@ support_chroot_free (struct support_chroot *chroot)
|
||
|
|
{
|
||
|
|
free (chroot->path_chroot);
|
||
|
|
free (chroot->path_resolv_conf);
|
||
|
|
+ free (chroot->path_hosts);
|
||
|
|
+ free (chroot->path_host_conf);
|
||
|
|
free (chroot);
|
||
|
|
}
|
||
|
|
|