diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-21 14:10:13 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-21 14:10:13 -0400 |
| commit | 0b4288e3168dee3224c04871528170442305348f (patch) | |
| tree | dd7088c01724398bbb6edb47ba07f4737fcc8a5d /src/systemd-remount-fs | |
| parent | 3ff85c76a6594fae008a548800fd47a126ab6eb5 (diff) | |
libcore, nspawn
Diffstat (limited to 'src/systemd-remount-fs')
| -rw-r--r-- | src/systemd-remount-fs/Makefile | 5 | ||||
| l--------- | src/systemd-remount-fs/mount-setup.c | 1 | ||||
| l--------- | src/systemd-remount-fs/mount-setup.h | 1 | ||||
| -rw-r--r-- | src/systemd-remount-fs/remount-fs.c | 19 |
4 files changed, 11 insertions, 15 deletions
diff --git a/src/systemd-remount-fs/Makefile b/src/systemd-remount-fs/Makefile index 1f9df2b99a..76f4941afb 100644 --- a/src/systemd-remount-fs/Makefile +++ b/src/systemd-remount-fs/Makefile @@ -25,11 +25,10 @@ include $(topsrcdir)/build-aux/Makefile.head.mk rootlibexec_PROGRAMS += systemd-remount-fs systemd_remount_fs_SOURCES = \ - src/remount-fs/remount-fs.c \ - src/core/mount-setup.c \ - src/core/mount-setup.h + src/remount-fs/remount-fs.c systemd_remount_fs_LDADD = \ + libcore.la \ libsystemd-shared.la sd.CPPFLAGS += -DMOUNT_PATH=\"$(MOUNT_PATH)\" diff --git a/src/systemd-remount-fs/mount-setup.c b/src/systemd-remount-fs/mount-setup.c deleted file mode 120000 index 67cb74c218..0000000000 --- a/src/systemd-remount-fs/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-remount-fs/mount-setup.h b/src/systemd-remount-fs/mount-setup.h deleted file mode 120000 index bae54ba700..0000000000 --- a/src/systemd-remount-fs/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-remount-fs/remount-fs.c b/src/systemd-remount-fs/remount-fs.c index 116c370ef7..d7dac1c1e6 100644 --- a/src/systemd-remount-fs/remount-fs.c +++ b/src/systemd-remount-fs/remount-fs.c @@ -25,16 +25,15 @@ #include <sys/wait.h> #include <unistd.h> -#include "basic/exit-status.h" -#include "basic/log.h" -#include "basic/mount-util.h" -#include "basic/path-util.h" -#include "basic/process-util.h" -#include "basic/signal-util.h" -#include "basic/strv.h" -#include "basic/util.h" - -#include "mount-setup.h" +#include "core/mount-setup.h" +#include "systemd-basic/exit-status.h" +#include "systemd-basic/log.h" +#include "systemd-basic/mount-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" /* Goes through /etc/fstab and remounts all API file systems, applying * options that are in /etc/fstab that systemd might not have |