diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-10 15:19:23 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-10 15:19:23 -0400 |
commit | 623d6918363a5f0d937d35a1fa10ce375c3ff258 (patch) | |
tree | 1986145fcb63602c2be4c596285b4d78a5d5dc30 /units | |
parent | fc37028d89f36352948b2302a57efdf25d63197a (diff) |
tidy
Diffstat (limited to 'units')
-rw-r--r-- | units/kexec.target | 17 | ||||
-rw-r--r-- | units/network.target (renamed from units/halt.target) | 12 | ||||
-rw-r--r-- | units/poweroff.target | 19 | ||||
-rw-r--r-- | units/reboot.target | 19 | ||||
-rw-r--r-- | units/systemd-halt.service.in | 17 | ||||
-rw-r--r-- | units/systemd-kexec.service.in | 17 | ||||
-rw-r--r-- | units/systemd-poweroff.service.in | 17 | ||||
-rw-r--r-- | units/systemd-reboot.service.in | 17 |
8 files changed, 4 insertions, 131 deletions
diff --git a/units/kexec.target b/units/kexec.target deleted file mode 100644 index 90795d0c5a..0000000000 --- a/units/kexec.target +++ /dev/null @@ -1,17 +0,0 @@ -# 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/units/halt.target b/units/network.target index a21d984b26..61ebdcadd0 100644 --- a/units/halt.target +++ b/units/network.target @@ -6,12 +6,8 @@ # (at your option) any later version. [Unit] -Description=Halt +Description=Network Documentation=man:systemd.special(7) -DefaultDependencies=no -Requires=systemd-halt.service -After=systemd-halt.service -AllowIsolate=yes - -[Install] -Alias=ctrl-alt-del.target +Documentation=http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget +After=network-pre.target +RefuseManualStart=yes diff --git a/units/poweroff.target b/units/poweroff.target deleted file mode 100644 index dd92d816ca..0000000000 --- a/units/poweroff.target +++ /dev/null @@ -1,19 +0,0 @@ -# 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/units/reboot.target b/units/reboot.target deleted file mode 100644 index 668b98d9e4..0000000000 --- a/units/reboot.target +++ /dev/null @@ -1,19 +0,0 @@ -# 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/units/systemd-halt.service.in b/units/systemd-halt.service.in deleted file mode 100644 index d55d622c1c..0000000000 --- a/units/systemd-halt.service.in +++ /dev/null @@ -1,17 +0,0 @@ -# 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/units/systemd-kexec.service.in b/units/systemd-kexec.service.in deleted file mode 100644 index 61303f917f..0000000000 --- a/units/systemd-kexec.service.in +++ /dev/null @@ -1,17 +0,0 @@ -# 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/units/systemd-poweroff.service.in b/units/systemd-poweroff.service.in deleted file mode 100644 index 3630719733..0000000000 --- a/units/systemd-poweroff.service.in +++ /dev/null @@ -1,17 +0,0 @@ -# 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/units/systemd-reboot.service.in b/units/systemd-reboot.service.in deleted file mode 100644 index d99bd3e701..0000000000 --- a/units/systemd-reboot.service.in +++ /dev/null @@ -1,17 +0,0 @@ -# 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 |