tidy

31 files changed, 143 insertions, 16 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/src/grp-network/network/network.target b/src/grp-system/systemd-shutdown/halt.target
index 61ebdcadd0..a21d984b26 100644
--- a/src/grp-network/network/network.target
+++ b/src/grp-system/systemd-shutdown/halt.target
@@ -6,8 +6,12 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Network
+Description=Halt
 Documentation=man:systemd.special(7)
-Documentation=http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget
-After=network-pre.target
-RefuseManualStart=yes
+DefaultDependencies=no
+Requires=systemd-halt.service
+After=systemd-halt.service
+AllowIsolate=yes
+
+[Install]
+Alias=ctrl-alt-del.target
diff --git a/src/grp-system/systemd-shutdown/kexec.target b/src/grp-system/systemd-shutdown/kexec.target
new file mode 100644
index 0000000000..90795d0c5a
--- /dev/null
+++ b/src/grp-system/systemd-shutdown/kexec.target
@@ -0,0 +1,17 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Reboot via kexec
+Documentation=man:systemd.special(7)
+DefaultDependencies=no
+Requires=systemd-kexec.service
+After=systemd-kexec.service
+AllowIsolate=yes
+
+[Install]
+Alias=ctrl-alt-del.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/src/grp-system/systemd-shutdown/poweroff.target b/src/grp-system/systemd-shutdown/poweroff.target
new file mode 100644
index 0000000000..dd92d816ca
--- /dev/null
+++ b/src/grp-system/systemd-shutdown/poweroff.target
@@ -0,0 +1,19 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Power-Off
+Documentation=man:systemd.special(7)
+DefaultDependencies=no
+Requires=systemd-poweroff.service
+After=systemd-poweroff.service
+AllowIsolate=yes
+JobTimeoutSec=30min
+JobTimeoutAction=poweroff-force
+
+[Install]
+Alias=ctrl-alt-del.target
diff --git a/src/grp-system/systemd-shutdown/reboot.target b/src/grp-system/systemd-shutdown/reboot.target
new file mode 100644
index 0000000000..668b98d9e4
--- /dev/null
+++ b/src/grp-system/systemd-shutdown/reboot.target
@@ -0,0 +1,19 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Reboot
+Documentation=man:systemd.special(7)
+DefaultDependencies=no
+Requires=systemd-reboot.service
+After=systemd-reboot.service
+AllowIsolate=yes
+JobTimeoutSec=30min
+JobTimeoutAction=reboot-force
+
+[Install]
+Alias=ctrl-alt-del.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/src/grp-system/systemd-shutdown/systemd-halt.service.in b/src/grp-system/systemd-shutdown/systemd-halt.service.in
new file mode 100644
index 0000000000..d55d622c1c
--- /dev/null
+++ b/src/grp-system/systemd-shutdown/systemd-halt.service.in
@@ -0,0 +1,17 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Halt
+Documentation=man:systemd-halt.service(8)
+DefaultDependencies=no
+Requires=shutdown.target umount.target final.target
+After=shutdown.target umount.target final.target
+
+[Service]
+Type=oneshot
+ExecStart=@SYSTEMCTL@ --force halt
diff --git a/src/grp-system/systemd-shutdown/systemd-kexec.service.in b/src/grp-system/systemd-shutdown/systemd-kexec.service.in
new file mode 100644
index 0000000000..61303f917f
--- /dev/null
+++ b/src/grp-system/systemd-shutdown/systemd-kexec.service.in
@@ -0,0 +1,17 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Reboot via kexec
+Documentation=man:systemd-halt.service(8)
+DefaultDependencies=no
+Requires=shutdown.target umount.target final.target
+After=shutdown.target umount.target final.target
+
+[Service]
+Type=oneshot
+ExecStart=@SYSTEMCTL@ --force kexec
diff --git a/src/grp-system/systemd-shutdown/systemd-poweroff.service.in b/src/grp-system/systemd-shutdown/systemd-poweroff.service.in
new file mode 100644
index 0000000000..3630719733
--- /dev/null
+++ b/src/grp-system/systemd-shutdown/systemd-poweroff.service.in
@@ -0,0 +1,17 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Power-Off
+Documentation=man:systemd-halt.service(8)
+DefaultDependencies=no
+Requires=shutdown.target umount.target final.target
+After=shutdown.target umount.target final.target
+
+[Service]
+Type=oneshot
+ExecStart=@SYSTEMCTL@ --force poweroff
diff --git a/src/grp-system/systemd-shutdown/systemd-reboot.service.in b/src/grp-system/systemd-shutdown/systemd-reboot.service.in
new file mode 100644
index 0000000000..d99bd3e701
--- /dev/null
+++ b/src/grp-system/systemd-shutdown/systemd-reboot.service.in
@@ -0,0 +1,17 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Reboot
+Documentation=man:systemd-halt.service(8)
+DefaultDependencies=no
+Requires=shutdown.target umount.target final.target
+After=shutdown.target umount.target final.target
+
+[Service]
+Type=oneshot
+ExecStart=@SYSTEMCTL@ --force reboot
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