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/grp-system/systemd-shutdown | |
| parent | 3ff85c76a6594fae008a548800fd47a126ab6eb5 (diff) | |
libcore, nspawn
Diffstat (limited to 'src/grp-system/systemd-shutdown')
| -rw-r--r-- | src/grp-system/systemd-shutdown/Makefile | 7 | ||||
| l--------- | src/grp-system/systemd-shutdown/killall.c | 1 | ||||
| l--------- | src/grp-system/systemd-shutdown/killall.h | 1 | ||||
| l--------- | src/grp-system/systemd-shutdown/mount-setup.c | 1 | ||||
| l--------- | src/grp-system/systemd-shutdown/mount-setup.h | 1 | ||||
| -rw-r--r-- | src/grp-system/systemd-shutdown/shutdown.c | 2 | ||||
| -rw-r--r-- | src/grp-system/systemd-shutdown/umount.c | 2 |
7 files changed, 4 insertions, 11 deletions
diff --git a/src/grp-system/systemd-shutdown/Makefile b/src/grp-system/systemd-shutdown/Makefile index c56f0f9adc..619f1bbdb5 100644 --- a/src/grp-system/systemd-shutdown/Makefile +++ b/src/grp-system/systemd-shutdown/Makefile @@ -27,13 +27,10 @@ rootlibexec_PROGRAMS += systemd-shutdown systemd_shutdown_SOURCES = \ src/core/umount.c \ src/core/umount.h \ - src/core/shutdown.c \ - src/core/mount-setup.c \ - src/core/mount-setup.h \ - src/core/killall.h \ - src/core/killall.c + src/core/shutdown.c systemd_shutdown_LDADD = \ + libcore.la \ libsystemd-shared.la sd.CPPFLAGS += -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" diff --git a/src/grp-system/systemd-shutdown/killall.c b/src/grp-system/systemd-shutdown/killall.c deleted file mode 120000 index 5ddb36306b..0000000000 --- a/src/grp-system/systemd-shutdown/killall.c +++ /dev/null @@ -1 +0,0 @@ -../libcore/killall.c
\ No newline at end of file diff --git a/src/grp-system/systemd-shutdown/killall.h b/src/grp-system/systemd-shutdown/killall.h deleted file mode 120000 index 60b334fe91..0000000000 --- a/src/grp-system/systemd-shutdown/killall.h +++ /dev/null @@ -1 +0,0 @@ -../libcore/killall.h
\ No newline at end of file diff --git a/src/grp-system/systemd-shutdown/mount-setup.c b/src/grp-system/systemd-shutdown/mount-setup.c deleted file mode 120000 index a4ab487157..0000000000 --- a/src/grp-system/systemd-shutdown/mount-setup.c +++ /dev/null @@ -1 +0,0 @@ -../libcore/mount-setup.c
\ No newline at end of file diff --git a/src/grp-system/systemd-shutdown/mount-setup.h b/src/grp-system/systemd-shutdown/mount-setup.h deleted file mode 120000 index 1f984851f8..0000000000 --- a/src/grp-system/systemd-shutdown/mount-setup.h +++ /dev/null @@ -1 +0,0 @@ -../libcore/mount-setup.h
\ No newline at end of file diff --git a/src/grp-system/systemd-shutdown/shutdown.c b/src/grp-system/systemd-shutdown/shutdown.c index 4517718f8f..11e2143089 100644 --- a/src/grp-system/systemd-shutdown/shutdown.c +++ b/src/grp-system/systemd-shutdown/shutdown.c @@ -30,6 +30,7 @@ #include <linux/reboot.h> +#include "core/killall.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/cgroup-util.h" #include "systemd-basic/def.h" @@ -45,7 +46,6 @@ #include "systemd-shared/switch-root.h" #include "systemd-shared/watchdog.h" -#include "killall.h" #include "umount.h" #define FINALIZE_ATTEMPTS 50 diff --git a/src/grp-system/systemd-shutdown/umount.c b/src/grp-system/systemd-shutdown/umount.c index 60c7354738..8d280c8c8c 100644 --- a/src/grp-system/systemd-shutdown/umount.c +++ b/src/grp-system/systemd-shutdown/umount.c @@ -28,6 +28,7 @@ #include <libudev.h> +#include "core/mount-setup.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/escape.h" #include "systemd-basic/fd-util.h" @@ -39,7 +40,6 @@ #include "systemd-shared/fstab-util.h" #include "systemd-shared/udev-util.h" -#include "mount-setup.h" #include "umount.h" typedef struct MountPoint { |