diff options
32 files changed, 12 insertions, 12 deletions
diff --git a/src/Makefile b/src/Makefile index 2ea58046bc..905d11d803 100644 --- a/src/Makefile +++ b/src/Makefile @@ -60,7 +60,6 @@ nested.subdirs += systemd-nspawn nested.subdirs += systemd-rc-local-generator nested.subdirs += systemd-remount-fs nested.subdirs += systemd-reply-password -nested.subdirs += systemd-shutdown nested.subdirs += systemd-socket-proxyd nested.subdirs += systemd-stdio-bridge nested.subdirs += systemd-system-update-generator diff --git a/src/grp-coredump/coredump.conf.xml b/src/grp-coredump/systemd-coredump/coredump.conf.xml index 4f95680a3a..4f95680a3a 100644 --- a/src/grp-coredump/coredump.conf.xml +++ b/src/grp-coredump/systemd-coredump/coredump.conf.xml diff --git a/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile index f6e07621a8..b3c2e450e5 100644 --- a/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile +++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile @@ -61,7 +61,7 @@ dist_gatewayddocumentroot_DATA = \ src/journal-remote/browse.html dist_sysusers_DATA += \ - sysusers.d/systemd-journal-gateway.conf + sysusers.d/systemd-journal-gatewayd.conf endif # HAVE_MICROHTTPD diff --git a/src/grp-journal/grp-remote/systemd-journal-gatewayd/systemd-journal-gateway.sysusers b/src/grp-journal/grp-remote/systemd-journal-gatewayd/systemd-journal-gatewayd.sysusers index a60fcf4d42..a60fcf4d42 100644 --- a/src/grp-journal/grp-remote/systemd-journal-gatewayd/systemd-journal-gateway.sysusers +++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/systemd-journal-gatewayd.sysusers diff --git a/src/grp-system/Makefile b/src/grp-system/Makefile index 1f794aa7ad..e031e2814f 100644 --- a/src/grp-system/Makefile +++ b/src/grp-system/Makefile @@ -23,7 +23,8 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -nested.subdirs += systemctl systemd libcore +nested.subdirs += systemctl systemd systemd-shutdown +nested.subdirs += libcore nested.subdirs += grp-utils include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-shutdown/Makefile b/src/grp-system/systemd-shutdown/Makefile index ba2dac9e47..257a057823 100644 --- a/src/systemd-shutdown/Makefile +++ b/src/grp-system/systemd-shutdown/Makefile @@ -20,7 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk rootlibexec_PROGRAMS += systemd-shutdown diff --git a/units/halt.target b/src/grp-system/systemd-shutdown/halt.target index a21d984b26..a21d984b26 100644 --- a/units/halt.target +++ b/src/grp-system/systemd-shutdown/halt.target diff --git a/units/kexec.target b/src/grp-system/systemd-shutdown/kexec.target index 90795d0c5a..90795d0c5a 100644 --- a/units/kexec.target +++ b/src/grp-system/systemd-shutdown/kexec.target diff --git a/src/grp-system/systemd-shutdown/killall.c b/src/grp-system/systemd-shutdown/killall.c new file mode 120000 index 0000000000..5ddb36306b --- /dev/null +++ b/src/grp-system/systemd-shutdown/killall.c @@ -0,0 +1 @@ +../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 new file mode 120000 index 0000000000..60b334fe91 --- /dev/null +++ b/src/grp-system/systemd-shutdown/killall.h @@ -0,0 +1 @@ +../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 new file mode 120000 index 0000000000..a4ab487157 --- /dev/null +++ b/src/grp-system/systemd-shutdown/mount-setup.c @@ -0,0 +1 @@ +../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 new file mode 120000 index 0000000000..1f984851f8 --- /dev/null +++ b/src/grp-system/systemd-shutdown/mount-setup.h @@ -0,0 +1 @@ +../libcore/mount-setup.h
\ No newline at end of file diff --git a/units/poweroff.target b/src/grp-system/systemd-shutdown/poweroff.target index dd92d816ca..dd92d816ca 100644 --- a/units/poweroff.target +++ b/src/grp-system/systemd-shutdown/poweroff.target diff --git a/units/reboot.target b/src/grp-system/systemd-shutdown/reboot.target index 668b98d9e4..668b98d9e4 100644 --- a/units/reboot.target +++ b/src/grp-system/systemd-shutdown/reboot.target diff --git a/src/systemd-shutdown/shutdown.c b/src/grp-system/systemd-shutdown/shutdown.c index bf74b5ec99..bf74b5ec99 100644 --- a/src/systemd-shutdown/shutdown.c +++ b/src/grp-system/systemd-shutdown/shutdown.c diff --git a/units/systemd-halt.service.in b/src/grp-system/systemd-shutdown/systemd-halt.service.in index d55d622c1c..d55d622c1c 100644 --- a/units/systemd-halt.service.in +++ b/src/grp-system/systemd-shutdown/systemd-halt.service.in diff --git a/units/systemd-kexec.service.in b/src/grp-system/systemd-shutdown/systemd-kexec.service.in index 61303f917f..61303f917f 100644 --- a/units/systemd-kexec.service.in +++ b/src/grp-system/systemd-shutdown/systemd-kexec.service.in diff --git a/units/systemd-poweroff.service.in b/src/grp-system/systemd-shutdown/systemd-poweroff.service.in index 3630719733..3630719733 100644 --- a/units/systemd-poweroff.service.in +++ b/src/grp-system/systemd-shutdown/systemd-poweroff.service.in diff --git a/units/systemd-reboot.service.in b/src/grp-system/systemd-shutdown/systemd-reboot.service.in index d99bd3e701..d99bd3e701 100644 --- a/units/systemd-reboot.service.in +++ b/src/grp-system/systemd-shutdown/systemd-reboot.service.in diff --git a/src/grp-system/systemctl/systemd-halt.service.xml b/src/grp-system/systemd-shutdown/systemd-shutdown.xml index c94e2a1820..749158e5da 100644 --- a/src/grp-system/systemctl/systemd-halt.service.xml +++ b/src/grp-system/systemd-shutdown/systemd-shutdown.xml @@ -21,10 +21,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="systemd-halt.service"> +<refentry id="systemd-shutdown"> <refentryinfo> - <title>systemd-halt.service</title> + <title>systemd-shutdown</title> <productname>systemd</productname> <authorgroup> @@ -38,7 +38,7 @@ </refentryinfo> <refmeta> - <refentrytitle>systemd-halt.service</refentrytitle> + <refentrytitle>systemd-shutdown</refentrytitle> <manvolnum>8</manvolnum> </refmeta> diff --git a/src/systemd-shutdown/umount.c b/src/grp-system/systemd-shutdown/umount.c index 0079f8ec78..0079f8ec78 100644 --- a/src/systemd-shutdown/umount.c +++ b/src/grp-system/systemd-shutdown/umount.c diff --git a/src/systemd-shutdown/umount.h b/src/grp-system/systemd-shutdown/umount.h index ce2fd9ec58..ce2fd9ec58 100644 --- a/src/systemd-shutdown/umount.h +++ b/src/grp-system/systemd-shutdown/umount.h diff --git a/src/grp-system/systemd/Makefile b/src/grp-system/systemd/Makefile index dc2eaba720..3efc406281 100644 --- a/src/grp-system/systemd/Makefile +++ b/src/grp-system/systemd/Makefile @@ -37,7 +37,7 @@ systemd_LDADD = \ dist_tmpfiles_DATA = \ tmpfiles.d/systemd.conf \ - systemd-tmp.conf + systemd-tmpfs.conf dist_pkgsysconf_DATA += \ src/core/system.conf \ diff --git a/src/grp-system/systemd/systemd-tmp.tmpfiles b/src/grp-system/systemd/systemd-tmpfs.tmpfiles index 52f6743d56..52f6743d56 100644 --- a/src/grp-system/systemd/systemd-tmp.tmpfiles +++ b/src/grp-system/systemd/systemd-tmpfs.tmpfiles diff --git a/src/grp-udev/hwdb/hwdb.xml b/src/grp-udev/systemd-hwdb/hwdb.xml index 2b1e60fb22..2b1e60fb22 100644 --- a/src/grp-udev/hwdb/hwdb.xml +++ b/src/grp-udev/systemd-hwdb/hwdb.xml diff --git a/src/grp-udev/udev.conf b/src/grp-udev/systemd-udevd/udev.conf index 47d1433002..47d1433002 100644 --- a/src/grp-udev/udev.conf +++ b/src/grp-udev/systemd-udevd/udev.conf diff --git a/src/grp-udev/udev.conf.xml b/src/grp-udev/systemd-udevd/udev.conf.xml index e104e53f5d..e104e53f5d 100644 --- a/src/grp-udev/udev.conf.xml +++ b/src/grp-udev/systemd-udevd/udev.conf.xml diff --git a/src/systemd-shutdown/killall.c b/src/systemd-shutdown/killall.c deleted file mode 120000 index 84c06d47ee..0000000000 --- a/src/systemd-shutdown/killall.c +++ /dev/null @@ -1 +0,0 @@ -../grp-system/libcore/killall.c
\ No newline at end of file diff --git a/src/systemd-shutdown/killall.h b/src/systemd-shutdown/killall.h deleted file mode 120000 index 10ac8c905d..0000000000 --- a/src/systemd-shutdown/killall.h +++ /dev/null @@ -1 +0,0 @@ -../grp-system/libcore/killall.h
\ No newline at end of file diff --git a/src/systemd-shutdown/mount-setup.c b/src/systemd-shutdown/mount-setup.c deleted file mode 120000 index 67cb74c218..0000000000 --- a/src/systemd-shutdown/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-shutdown/mount-setup.h b/src/systemd-shutdown/mount-setup.h deleted file mode 120000 index bae54ba700..0000000000 --- a/src/systemd-shutdown/mount-setup.h +++ /dev/null @@ -1 +0,0 @@ -../grp-system/libcore/mount-setup.h
\ No newline at end of file diff --git a/src/grp-network/network/network.target b/units/network.target index 61ebdcadd0..61ebdcadd0 100644 --- a/src/grp-network/network/network.target +++ b/units/network.target |