units: get rid of distro-specific shutdown scripts, replace them by systemd-shutdown invocations

19 files changed, 6 insertions, 293 deletions

diff --git a/units/.gitignore b/units/.gitignore
index 83fc32cfd9..77d7e28690 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -1,3 +1,6 @@
+halt.service
+poweroff.service
+reboot.service
 kexec.service
 systemd-user-sessions.service
 systemd-readahead-done.service
diff --git a/units/debian/halt.service b/units/debian/halt.service
deleted file mode 100644
index 96061be56f..0000000000
--- a/units/debian/halt.service
+++ /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 General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Halt
-DefaultDependencies=no
-Requires=shutdown.target umount.target killall.service
-After=shutdown.target umount.target killall.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-Environment=INIT_HALT=HALT RUNLEVEL=0
-ExecStart=/etc/init.d/halt stop
-StandardOutput=tty
diff --git a/units/debian/killall.service b/units/debian/killall.service
deleted file mode 100644
index b7ed11aca6..0000000000
--- a/units/debian/killall.service
+++ /dev/null
@@ -1,18 +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 General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Kill All Processes
-DefaultDependencies=no
-After=shutdown.target
-RefuseManualStart=yes
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/etc/init.d/sendsigs stop
-StandardOutput=tty
diff --git a/units/debian/poweroff.service b/units/debian/poweroff.service
deleted file mode 100644
index 34a6683040..0000000000
--- a/units/debian/poweroff.service
+++ /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 General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Power-Off
-DefaultDependencies=no
-Requires=shutdown.target umount.target killall.service
-After=shutdown.target umount.target killall.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-Environment=RUNLEVEL=0
-ExecStart=/etc/init.d/halt stop
-StandardOutput=tty
diff --git a/units/debian/reboot.service b/units/debian/reboot.service
deleted file mode 100644
index 99f259e992..0000000000
--- a/units/debian/reboot.service
+++ /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 General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Reboot
-DefaultDependencies=no
-Requires=shutdown.target umount.target killall.service
-After=shutdown.target umount.target killall.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-Environment=RUNLEVEL=6
-ExecStart=/etc/init.d/reboot stop
-StandardOutput=tty
diff --git a/units/fedora/halt.service b/units/fedora/halt.service
deleted file mode 100644
index c337dce6d9..0000000000
--- a/units/fedora/halt.service
+++ /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 General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Halt
-DefaultDependencies=no
-Requires=shutdown.target umount.target killall.service
-After=shutdown.target umount.target killall.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-Environment=INIT_HALT=HALT RUNLEVEL=0
-ExecStart=/etc/init.d/halt start
-StandardOutput=tty
diff --git a/units/fedora/killall.service b/units/fedora/killall.service
deleted file mode 100644
index b81b6a83d1..0000000000
--- a/units/fedora/killall.service
+++ /dev/null
@@ -1,18 +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 General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Kill All Processes
-DefaultDependencies=no
-After=shutdown.target
-RefuseManualStart=yes
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=-/etc/init.d/killall start
-StandardOutput=tty
diff --git a/units/fedora/poweroff.service b/units/fedora/poweroff.service
deleted file mode 100644
index dbbed75d6d..0000000000
--- a/units/fedora/poweroff.service
+++ /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 General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Power-Off
-DefaultDependencies=no
-Requires=shutdown.target umount.target killall.service
-After=shutdown.target umount.target killall.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-Environment=RUNLEVEL=0
-ExecStart=/etc/init.d/halt start
-StandardOutput=tty
diff --git a/units/fedora/reboot.service b/units/fedora/reboot.service
deleted file mode 100644
index ca8b3b182a..0000000000
--- a/units/fedora/reboot.service
+++ /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 General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Reboot
-DefaultDependencies=no
-Requires=shutdown.target umount.target killall.service
-After=shutdown.target umount.target killall.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-Environment=RUNLEVEL=6
-ExecStart=/etc/init.d/reboot start
-StandardOutput=tty
diff --git a/units/gentoo/halt.service b/units/gentoo/halt.service
deleted file mode 100644
index d97b942fe0..0000000000
--- a/units/gentoo/halt.service
+++ /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 General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Halt
-DefaultDependencies=no
-Requires=shutdown.target umount.target killall.service
-After=shutdown.target umount.target killall.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-Environment=INIT_HALT=HALT RC_DOWN_HARDDISK=yes
-ExecStart=/etc/init.d/shutdown.sh
-StandardOutput=tty
diff --git a/units/gentoo/killall.service b/units/gentoo/killall.service
deleted file mode 100644
index de994d1f03..0000000000
--- a/units/gentoo/killall.service
+++ /dev/null
@@ -1,18 +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 General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Kill All Processes
-DefaultDependencies=no
-After=shutdown.target
-RefuseManualStart=yes
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=-/etc/init.d/killprocs start
-StandardOutput=tty
diff --git a/units/gentoo/poweroff.service b/units/gentoo/poweroff.service
deleted file mode 100644
index 2483f9448c..0000000000
--- a/units/gentoo/poweroff.service
+++ /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 General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Power-Off
-DefaultDependencies=no
-Requires=shutdown.target umount.target killall.service
-After=shutdown.target umount.target killall.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-Environment=RC_DOWN_HARDDISK=yes
-ExecStart=/etc/init.d/shutdown.sh
-StandardOutput=tty
diff --git a/units/gentoo/reboot.service b/units/gentoo/reboot.service
deleted file mode 100644
index 8f8d7328c7..0000000000
--- a/units/gentoo/reboot.service
+++ /dev/null
@@ -1,18 +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 General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Reboot
-DefaultDependencies=no
-Requires=shutdown.target umount.target killall.service
-After=shutdown.target umount.target killall.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/etc/init.d/reboot.sh
-StandardOutput=tty
diff --git a/units/arch/halt.service b/units/halt.service.in
index 2079bc025c..730c4c2955 100644
--- a/units/arch/halt.service
+++ b/units/halt.service.in
@@ -13,7 +13,4 @@ After=shutdown.target umount.target
 
 [Service]
 Type=oneshot
-RemainAfterExit=yes
-Environment=RUNLEVEL=0
-ExecStart=/etc/rc.shutdown
-StandardOutput=tty
+ExecStart=@SYSTEMCTL@ --force halt
diff --git a/units/arch/poweroff.service b/units/poweroff.service.in
index df2812fd9b..da66f8efce 100644
--- a/units/arch/poweroff.service
+++ b/units/poweroff.service.in
@@ -13,7 +13,4 @@ After=shutdown.target umount.target
 
 [Service]
 Type=oneshot
-RemainAfterExit=yes
-Environment=RUNLEVEL=0
-ExecStart=/etc/rc.shutdown
-StandardOutput=tty
+ExecStart=@SYSTEMCTL@ --force poweroff
diff --git a/units/arch/reboot.service b/units/reboot.service.in
index ae5c979e3e..e5e666f2d7 100644
--- a/units/arch/reboot.service
+++ b/units/reboot.service.in
@@ -13,7 +13,4 @@ After=shutdown.target umount.target
 
 [Service]
 Type=oneshot
-RemainAfterExit=yes
-Environment=RUNLEVEL=6
-ExecStart=/etc/rc.shutdown
-StandardOutput=tty
+ExecStart=@SYSTEMCTL@ --force reboot
diff --git a/units/suse/halt.service b/units/suse/halt.service
deleted file mode 100644
index d826ca3e22..0000000000
--- a/units/suse/halt.service
+++ /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 General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Halt
-DefaultDependencies=no
-Requires=shutdown.target umount.target
-After=shutdown.target umount.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-Environment=INIT_HALT=HALT RUNLEVEL=0 COLD_BOOT=1
-ExecStart=/etc/init.d/halt
-StandardOutput=tty
diff --git a/units/suse/poweroff.service b/units/suse/poweroff.service
deleted file mode 100644
index fe8c67761e..0000000000
--- a/units/suse/poweroff.service
+++ /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 General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Power-Off
-DefaultDependencies=no
-Requires=shutdown.target umount.target
-After=shutdown.target umount.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-Environment=COLD_BOOT=1
-ExecStart=/etc/init.d/halt
-StandardOutput=tty
diff --git a/units/suse/reboot.service b/units/suse/reboot.service
deleted file mode 100644
index 001d1364a0..0000000000
--- a/units/suse/reboot.service
+++ /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 General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Reboot
-DefaultDependencies=no
-Requires=shutdown.target umount.target
-After=shutdown.target umount.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-Environment=COLD_BOOT=1
-ExecStart=/etc/init.d/reboot
-StandardOutput=tty