libcore, nspawn

8 files changed, 14 insertions, 12 deletions

diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index ff55db23e5..337ad7a428 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -45,11 +45,7 @@ systemd_nspawn_SOURCES = \
 	src/nspawn/nspawn-stub-pid1.c \
 	src/nspawn/nspawn-stub-pid1.h \
 	src/nspawn/nspawn-patch-uid.c \
-	src/nspawn/nspawn-patch-uid.h \
-	src/core/mount-setup.c \
-	src/core/mount-setup.h \
-	src/core/loopback-setup.c \
-	src/core/loopback-setup.h
+	src/nspawn/nspawn-patch-uid.h
 
 nodist_systemd_nspawn_SOURCES = \
 	src/nspawn/nspawn-gperf.c
@@ -64,6 +60,9 @@ systemd_nspawn_CFLAGS = \
 	$(SELINUX_CFLAGS)
 
 systemd_nspawn_LDADD = \
+	libcore.la \
+	libsystemd-blkid.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la \
 	$(ACL_LIBS) \
 	$(BLKID_LIBS) \
diff --git a/src/systemd-nspawn/loopback-setup.c b/src/systemd-nspawn/loopback-setup.c
deleted file mode 120000
index da633f4936..0000000000
--- a/src/systemd-nspawn/loopback-setup.c
+++ /dev/null
@@ -1 +0,0 @@
-../grp-system/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
deleted file mode 120000
index dc051ab1bd..0000000000
--- a/src/systemd-nspawn/loopback-setup.h
+++ /dev/null
@@ -1 +0,0 @@
-../grp-system/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
deleted file mode 120000
index 78f80e2b73..0000000000
--- a/src/systemd-nspawn/machine-id-setup.c
+++ /dev/null
@@ -1 +0,0 @@
-../grp-system/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
deleted file mode 120000
index d2659724ce..0000000000
--- a/src/systemd-nspawn/machine-id-setup.h
+++ /dev/null
@@ -1 +0,0 @@
-../grp-system/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
deleted file mode 120000
index 67cb74c218..0000000000
--- a/src/systemd-nspawn/mount-setup.c
+++ /dev/null
@@ -1 +0,0 @@
-../grp-system/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
deleted file mode 120000
index bae54ba700..0000000000
--- a/src/systemd-nspawn/mount-setup.h
+++ /dev/null
@@ -1 +0,0 @@
-../grp-system/libcore/mount-setup.h
\ No newline at end of file
diff --git a/src/systemd-nspawn/nspawn.c b/src/systemd-nspawn/nspawn.c
index 73c71a8892..868f72eb87 100644
--- a/src/systemd-nspawn/nspawn.c
+++ b/src/systemd-nspawn/nspawn.c
@@ -44,6 +44,8 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-id128.h>
 
+#include "core/loopback-setup.h"
+#include "sd-id128/id128-util.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/barrier.h"
 #include "systemd-basic/btrfs-util.h"
@@ -68,6 +70,14 @@
 #include "systemd-basic/random-util.h"
 #include "systemd-basic/raw-clone.h"
 #include "systemd-basic/rm-rf.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/umask-util.h"
+#include "systemd-basic/user-util.h"
 #include "systemd-blkid/blkid-util.h"
 #include "systemd-shared/base-filesystem.h"
 #include "systemd-shared/dev-setup.h"
@@ -77,7 +87,6 @@
 #include "systemd-shared/ptyfwd.h"
 #include "systemd-shared/udev-util.h"
 
-#include "loopback-setup.h"
 #include "nspawn-cgroup.h"
 #include "nspawn-expose-ports.h"
 #include "nspawn-mount.h"