From 458554a48c62b7885a9347bb7103922f3b1f69e3 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Wed, 27 Jul 2016 23:40:47 -0400
Subject: fix

---
 src/systemd-nspawn/nspawn-cgroup.c       | 16 +++----
 src/systemd-nspawn/nspawn-expose-ports.c | 14 +++----
 src/systemd-nspawn/nspawn-expose-ports.h |  4 +-
 src/systemd-nspawn/nspawn-mount.c        | 32 +++++++-------
 src/systemd-nspawn/nspawn-network.c      | 16 +++----
 src/systemd-nspawn/nspawn-patch-uid.c    | 16 +++----
 src/systemd-nspawn/nspawn-register.c     |  6 +--
 src/systemd-nspawn/nspawn-settings.c     | 18 ++++----
 src/systemd-nspawn/nspawn-settings.h     |  2 +-
 src/systemd-nspawn/nspawn-setuid.c       | 16 +++----
 src/systemd-nspawn/nspawn-stub-pid1.c    | 12 +++---
 src/systemd-nspawn/nspawn.c              | 72 ++++++++++++++++----------------
 src/systemd-nspawn/test-patch-uid.c      |  6 +--
 13 files changed, 115 insertions(+), 115 deletions(-)

(limited to 'src/systemd-nspawn')

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 56afe930ac..4da7ef744f 100644
--- a/src/systemd-nspawn/nspawn-expose-ports.c
+++ b/src/systemd-nspawn/nspawn-expose-ports.c
@@ -19,16 +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 "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-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 917827eac1..dd8208633e 100644
--- a/src/systemd-nspawn/nspawn-network.c
+++ b/src/systemd-nspawn/nspawn-network.c
@@ -24,16 +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 "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 "basic/siphash24.h"
+#include "basic/socket-util.h"
+#include "basic/stat-util.h"
+#include "basic/string-util.h"
 #include "udev-util.h"
-#include "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..91b3c8e7ac 100644
--- a/src/systemd-nspawn/nspawn-patch-uid.c
+++ b/src/systemd-nspawn/nspawn-patch-uid.c
@@ -27,15 +27,15 @@
 #include <unistd.h>
 
 #include "acl-util.h"
-#include "dirent-util.h"
-#include "fd-util.h"
-#include "missing.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 02359ca773..4eb0031a39 100644
--- a/src/systemd-nspawn/nspawn-register.c
+++ b/src/systemd-nspawn/nspawn-register.c
@@ -23,9 +23,9 @@
 #include "bus-unit-util.h"
 #include "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..2ab881a63f 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 "basic/alloc-util.h"
+#include "basic/cap-list.h"
 #include "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 6390197646..16558a07e1 100644
--- a/src/systemd-nspawn/nspawn.c
+++ b/src/systemd-nspawn/nspawn.c
@@ -46,32 +46,32 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-id128.h>
 
-#include "alloc-util.h"
-#include "barrier.h"
+#include "basic/alloc-util.h"
+#include "basic/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 "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 "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 "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 "gpt.h"
-#include "hostname-util.h"
-#include "log.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 "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"
@@ -81,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 "basic/parse-util.h"
+#include "basic/path-util.h"
+#include "basic/process-util.h"
 #include "ptyfwd.h"
-#include "random-util.h"
-#include "rm-rf.h"
+#include "basic/random-util.h"
+#include "basic/rm-rf.h"
 #ifdef HAVE_SECCOMP
 #include "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 "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 "udev-util.h"
-#include "umask-util.h"
-#include "user-util.h"
-#include "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;
-- 
cgit v1.2.3-54-g00ecf