diff options
Diffstat (limited to 'src/systemd-nspawn')
-rw-r--r-- | src/systemd-nspawn/Makefile | 2 | ||||
l--------- | src/systemd-nspawn/loopback-setup.c | 1 | ||||
l--------- | src/systemd-nspawn/loopback-setup.h | 1 | ||||
l--------- | src/systemd-nspawn/machine-id-setup.c | 1 | ||||
l--------- | src/systemd-nspawn/machine-id-setup.h | 1 | ||||
l--------- | src/systemd-nspawn/mount-setup.c | 1 | ||||
l--------- | src/systemd-nspawn/mount-setup.h | 1 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-cgroup.c | 16 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-expose-ports.c | 17 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-expose-ports.h | 4 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-gperf.gperf | 2 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-mount.c | 32 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-network.c | 19 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-patch-uid.c | 18 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-register.c | 12 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-settings.c | 20 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-settings.h | 2 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-setuid.c | 16 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-stub-pid1.c | 12 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn.c | 87 | ||||
-rw-r--r-- | src/systemd-nspawn/test-patch-uid.c | 6 |
21 files changed, 138 insertions, 133 deletions
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile index d6f928ebd6..8ea5967add 100644 --- a/src/systemd-nspawn/Makefile +++ b/src/systemd-nspawn/Makefile @@ -82,4 +82,6 @@ test_patch_uid_LDADD = \ manual_tests += \ test-patch-uid +systemd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-nspawn/loopback-setup.c b/src/systemd-nspawn/loopback-setup.c new file mode 120000 index 0000000000..1078ace0bf --- /dev/null +++ b/src/systemd-nspawn/loopback-setup.c @@ -0,0 +1 @@ +../libcore/loopback-setup.c
\ No newline at end of file diff --git a/src/systemd-nspawn/loopback-setup.h b/src/systemd-nspawn/loopback-setup.h new file mode 120000 index 0000000000..18fc7663a2 --- /dev/null +++ b/src/systemd-nspawn/loopback-setup.h @@ -0,0 +1 @@ +../libcore/loopback-setup.h
\ No newline at end of file diff --git a/src/systemd-nspawn/machine-id-setup.c b/src/systemd-nspawn/machine-id-setup.c new file mode 120000 index 0000000000..2f0f2d8cf1 --- /dev/null +++ b/src/systemd-nspawn/machine-id-setup.c @@ -0,0 +1 @@ +../libcore/machine-id-setup.c
\ No newline at end of file diff --git a/src/systemd-nspawn/machine-id-setup.h b/src/systemd-nspawn/machine-id-setup.h new file mode 120000 index 0000000000..6b34cb74f4 --- /dev/null +++ b/src/systemd-nspawn/machine-id-setup.h @@ -0,0 +1 @@ +../libcore/machine-id-setup.h
\ No newline at end of file diff --git a/src/systemd-nspawn/mount-setup.c b/src/systemd-nspawn/mount-setup.c new file mode 120000 index 0000000000..a4ab487157 --- /dev/null +++ b/src/systemd-nspawn/mount-setup.c @@ -0,0 +1 @@ +../libcore/mount-setup.c
\ No newline at end of file diff --git a/src/systemd-nspawn/mount-setup.h b/src/systemd-nspawn/mount-setup.h new file mode 120000 index 0000000000..1f984851f8 --- /dev/null +++ b/src/systemd-nspawn/mount-setup.h @@ -0,0 +1 @@ +../libcore/mount-setup.h
\ No newline at end of file diff --git a/src/systemd-nspawn/nspawn-cgroup.c b/src/systemd-nspawn/nspawn-cgroup.c index f50f1ad6c2..67c86303e5 100644 --- a/src/systemd-nspawn/nspawn-cgroup.c +++ b/src/systemd-nspawn/nspawn-cgroup.c @@ -19,15 +19,15 @@ #include <sys/mount.h> -#include "alloc-util.h" -#include "cgroup-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "mkdir.h" +#include "basic/alloc-util.h" +#include "basic/cgroup-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/mkdir.h" #include "nspawn-cgroup.h" -#include "string-util.h" -#include "strv.h" -#include "util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/util.h" int chown_cgroup(pid_t pid, uid_t uid_shift) { _cleanup_free_ char *path = NULL, *fs = NULL; diff --git a/src/systemd-nspawn/nspawn-expose-ports.c b/src/systemd-nspawn/nspawn-expose-ports.c index 8122a14f7b..4da7ef744f 100644 --- a/src/systemd-nspawn/nspawn-expose-ports.c +++ b/src/systemd-nspawn/nspawn-expose-ports.c @@ -19,17 +19,16 @@ #include <systemd/sd-netlink.h> -#include "alloc-util.h" -#include "fd-util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" #include "firewall-util.h" -#include "in-addr-util.h" -#include "local-addresses.h" -#include "netlink-util.h" +#include "basic/in-addr-util.h" +#include "sd-netlink/local-addresses.h" #include "nspawn-expose-ports.h" -#include "parse-util.h" -#include "socket-util.h" -#include "string-util.h" -#include "util.h" +#include "basic/parse-util.h" +#include "basic/socket-util.h" +#include "basic/string-util.h" +#include "basic/util.h" int expose_port_parse(ExposePort **l, const char *s) { diff --git a/src/systemd-nspawn/nspawn-expose-ports.h b/src/systemd-nspawn/nspawn-expose-ports.h index 0e9f8f7e88..0003b74e62 100644 --- a/src/systemd-nspawn/nspawn-expose-ports.h +++ b/src/systemd-nspawn/nspawn-expose-ports.h @@ -24,8 +24,8 @@ #include <systemd/sd-event.h> #include <systemd/sd-netlink.h> -#include "in-addr-util.h" -#include "list.h" +#include "basic/in-addr-util.h" +#include "basic/list.h" typedef struct ExposePort { int protocol; diff --git a/src/systemd-nspawn/nspawn-gperf.gperf b/src/systemd-nspawn/nspawn-gperf.gperf index 2b5d452662..f814ed8863 100644 --- a/src/systemd-nspawn/nspawn-gperf.gperf +++ b/src/systemd-nspawn/nspawn-gperf.gperf @@ -1,6 +1,6 @@ %{ #include <stddef.h> -#include "conf-parser.h" +#include "shared/conf-parser.h" #include "nspawn-settings.h" #include "nspawn-expose-ports.h" %} diff --git a/src/systemd-nspawn/nspawn-mount.c b/src/systemd-nspawn/nspawn-mount.c index 8e2d2d543c..7e8bd936f2 100644 --- a/src/systemd-nspawn/nspawn-mount.c +++ b/src/systemd-nspawn/nspawn-mount.c @@ -20,23 +20,23 @@ #include <sys/mount.h> #include <linux/magic.h> -#include "alloc-util.h" -#include "cgroup-util.h" -#include "escape.h" -#include "fs-util.h" -#include "label.h" -#include "mkdir.h" -#include "mount-util.h" +#include "basic/alloc-util.h" +#include "basic/cgroup-util.h" +#include "basic/escape.h" +#include "basic/fs-util.h" +#include "basic/label.h" +#include "basic/mkdir.h" +#include "basic/mount-util.h" #include "nspawn-mount.h" -#include "parse-util.h" -#include "path-util.h" -#include "rm-rf.h" -#include "set.h" -#include "stat-util.h" -#include "string-util.h" -#include "strv.h" -#include "user-util.h" -#include "util.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/rm-rf.h" +#include "basic/set.h" +#include "basic/stat-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/user-util.h" +#include "basic/util.h" CustomMount* custom_mount_add(CustomMount **l, unsigned *n, CustomMountType t) { CustomMount *c, *ret; diff --git a/src/systemd-nspawn/nspawn-network.c b/src/systemd-nspawn/nspawn-network.c index 7052fb5804..98bb3e386f 100644 --- a/src/systemd-nspawn/nspawn-network.c +++ b/src/systemd-nspawn/nspawn-network.c @@ -24,17 +24,16 @@ #include <systemd/sd-id128.h> #include <systemd/sd-netlink.h> -#include "alloc-util.h" -#include "ether-addr-util.h" -#include "lockfile-util.h" -#include "netlink-util.h" +#include "basic/alloc-util.h" +#include "basic/ether-addr-util.h" +#include "basic/lockfile-util.h" #include "nspawn-network.h" -#include "siphash24.h" -#include "socket-util.h" -#include "stat-util.h" -#include "string-util.h" -#include "udev-util.h" -#include "util.h" +#include "basic/siphash24.h" +#include "basic/socket-util.h" +#include "basic/stat-util.h" +#include "basic/string-util.h" +#include "shared/udev-util.h" +#include "basic/util.h" #define HOST_HASH_KEY SD_ID128_MAKE(1a,37,6f,c7,46,ec,45,0b,ad,a3,d5,31,06,60,5d,b1) #define CONTAINER_HASH_KEY SD_ID128_MAKE(c3,c4,f9,19,b5,57,b2,1c,e6,cf,14,27,03,9c,ee,a2) diff --git a/src/systemd-nspawn/nspawn-patch-uid.c b/src/systemd-nspawn/nspawn-patch-uid.c index c7382d412d..737ffd246e 100644 --- a/src/systemd-nspawn/nspawn-patch-uid.c +++ b/src/systemd-nspawn/nspawn-patch-uid.c @@ -26,16 +26,16 @@ #include <sys/vfs.h> #include <unistd.h> -#include "acl-util.h" -#include "dirent-util.h" -#include "fd-util.h" -#include "missing.h" +#include "shared/acl-util.h" +#include "basic/dirent-util.h" +#include "basic/fd-util.h" +#include "basic/missing.h" #include "nspawn-patch-uid.h" -#include "stat-util.h" -#include "stdio-util.h" -#include "string-util.h" -#include "strv.h" -#include "user-util.h" +#include "basic/stat-util.h" +#include "basic/stdio-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/user-util.h" #ifdef HAVE_ACL diff --git a/src/systemd-nspawn/nspawn-register.c b/src/systemd-nspawn/nspawn-register.c index adef200cb5..29e60ca48a 100644 --- a/src/systemd-nspawn/nspawn-register.c +++ b/src/systemd-nspawn/nspawn-register.c @@ -19,13 +19,13 @@ #include <systemd/sd-bus.h> -#include "bus-error.h" -#include "bus-unit-util.h" -#include "bus-util.h" +#include "sd-bus/bus-error.h" /* for bus_error_message */ +#include "shared/bus-unit-util.h" +#include "shared/bus-util.h" #include "nspawn-register.h" -#include "stat-util.h" -#include "strv.h" -#include "util.h" +#include "basic/stat-util.h" +#include "basic/strv.h" +#include "basic/util.h" int register_machine( const char *machine_name, diff --git a/src/systemd-nspawn/nspawn-settings.c b/src/systemd-nspawn/nspawn-settings.c index 5f1522cfb6..e5cc385e07 100644 --- a/src/systemd-nspawn/nspawn-settings.c +++ b/src/systemd-nspawn/nspawn-settings.c @@ -17,18 +17,18 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "alloc-util.h" -#include "cap-list.h" -#include "conf-parser.h" +#include "basic/alloc-util.h" +#include "basic/cap-list.h" +#include "shared/conf-parser.h" #include "nspawn-network.h" #include "nspawn-settings.h" -#include "parse-util.h" -#include "process-util.h" -#include "socket-util.h" -#include "string-util.h" -#include "strv.h" -#include "user-util.h" -#include "util.h" +#include "basic/parse-util.h" +#include "basic/process-util.h" +#include "basic/socket-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/user-util.h" +#include "basic/util.h" int settings_load(FILE *f, const char *path, Settings **ret) { _cleanup_(settings_freep) Settings *s = NULL; diff --git a/src/systemd-nspawn/nspawn-settings.h b/src/systemd-nspawn/nspawn-settings.h index 1c47e37912..0abf4c9835 100644 --- a/src/systemd-nspawn/nspawn-settings.h +++ b/src/systemd-nspawn/nspawn-settings.h @@ -21,7 +21,7 @@ #include <stdio.h> -#include "macro.h" +#include "basic/macro.h" #include "nspawn-expose-ports.h" #include "nspawn-mount.h" diff --git a/src/systemd-nspawn/nspawn-setuid.c b/src/systemd-nspawn/nspawn-setuid.c index ee15a47e93..b42c4c2456 100644 --- a/src/systemd-nspawn/nspawn-setuid.c +++ b/src/systemd-nspawn/nspawn-setuid.c @@ -21,15 +21,15 @@ #include <sys/types.h> #include <unistd.h> -#include "alloc-util.h" -#include "fd-util.h" -#include "mkdir.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" +#include "basic/mkdir.h" #include "nspawn-setuid.h" -#include "process-util.h" -#include "signal-util.h" -#include "string-util.h" -#include "user-util.h" -#include "util.h" +#include "basic/process-util.h" +#include "basic/signal-util.h" +#include "basic/string-util.h" +#include "basic/user-util.h" +#include "basic/util.h" static int spawn_getent(const char *database, const char *key, pid_t *rpid) { int pipe_fds[2]; diff --git a/src/systemd-nspawn/nspawn-stub-pid1.c b/src/systemd-nspawn/nspawn-stub-pid1.c index 2de87e3c63..47243ee082 100644 --- a/src/systemd-nspawn/nspawn-stub-pid1.c +++ b/src/systemd-nspawn/nspawn-stub-pid1.c @@ -21,13 +21,13 @@ #include <sys/unistd.h> #include <sys/wait.h> -#include "fd-util.h" -#include "log.h" +#include "basic/fd-util.h" +#include "basic/log.h" #include "nspawn-stub-pid1.h" -#include "process-util.h" -#include "signal-util.h" -#include "time-util.h" -#include "def.h" +#include "basic/process-util.h" +#include "basic/signal-util.h" +#include "basic/time-util.h" +#include "basic/def.h" int stub_pid1(void) { enum { diff --git a/src/systemd-nspawn/nspawn.c b/src/systemd-nspawn/nspawn.c index bdf054e5c6..fc913a2363 100644 --- a/src/systemd-nspawn/nspawn.c +++ b/src/systemd-nspawn/nspawn.c @@ -46,33 +46,32 @@ #include <systemd/sd-daemon.h> #include <systemd/sd-id128.h> -#include "alloc-util.h" -#include "barrier.h" -#include "base-filesystem.h" -#include "blkid-util.h" -#include "btrfs-util.h" -#include "cap-list.h" -#include "capability-util.h" -#include "cgroup-util.h" -#include "copy.h" -#include "dev-setup.h" -#include "env-util.h" -#include "fd-util.h" -#include "fdset.h" -#include "fileio.h" -#include "formats-util.h" -#include "fs-util.h" -#include "gpt.h" -#include "hostname-util.h" -#include "log.h" +#include "basic/alloc-util.h" +#include "basic/barrier.h" +#include "shared/base-filesystem.h" +#include "basic/blkid-util.h" +#include "basic/btrfs-util.h" +#include "basic/cap-list.h" +#include "basic/capability-util.h" +#include "basic/cgroup-util.h" +#include "basic/copy.h" +#include "shared/dev-setup.h" +#include "basic/env-util.h" +#include "basic/fd-util.h" +#include "basic/fdset.h" +#include "basic/fileio.h" +#include "basic/formats-util.h" +#include "basic/fs-util.h" +#include "shared/gpt.h" +#include "basic/hostname-util.h" +#include "basic/log.h" #include "loopback-setup.h" #include "machine-id-setup.h" -#include "machine-image.h" -#include "macro.h" -#include "missing.h" -#include "mkdir.h" -#include "mount-util.h" -#include "netlink-util.h" +#include "shared/machine-image.h" +#include "basic/macro.h" +#include "basic/missing.h" +#include "basic/mkdir.h" +#include "basic/mount-util.h" #include "nspawn-cgroup.h" #include "nspawn-expose-ports.h" #include "nspawn-mount.h" @@ -82,27 +81,27 @@ #include "nspawn-settings.h" #include "nspawn-setuid.h" #include "nspawn-stub-pid1.h" -#include "parse-util.h" -#include "path-util.h" -#include "process-util.h" -#include "ptyfwd.h" -#include "random-util.h" -#include "rm-rf.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "shared/ptyfwd.h" +#include "basic/random-util.h" +#include "basic/rm-rf.h" #ifdef HAVE_SECCOMP -#include "seccomp-util.h" +#include "shared/seccomp-util.h" #endif -#include "selinux-util.h" -#include "signal-util.h" -#include "socket-util.h" -#include "stat-util.h" -#include "stdio-util.h" -#include "string-util.h" -#include "strv.h" -#include "terminal-util.h" -#include "udev-util.h" -#include "umask-util.h" -#include "user-util.h" -#include "util.h" +#include "basic/selinux-util.h" +#include "basic/signal-util.h" +#include "basic/socket-util.h" +#include "basic/stat-util.h" +#include "basic/stdio-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/terminal-util.h" +#include "shared/udev-util.h" +#include "basic/umask-util.h" +#include "basic/user-util.h" +#include "basic/util.h" /* Note that devpts's gid= parameter parses GIDs as signed values, hence we stay away from the upper half of the 32bit * UID range here */ diff --git a/src/systemd-nspawn/test-patch-uid.c b/src/systemd-nspawn/test-patch-uid.c index 11c5321788..8b990da220 100644 --- a/src/systemd-nspawn/test-patch-uid.c +++ b/src/systemd-nspawn/test-patch-uid.c @@ -19,10 +19,10 @@ #include <stdlib.h> -#include "log.h" +#include "basic/log.h" #include "nspawn-patch-uid.h" -#include "user-util.h" -#include "util.h" +#include "basic/user-util.h" +#include "basic/util.h" int main(int argc, char *argv[]) { uid_t shift, range; |