Don't ship our own halt service; systemd handles this natively.

We will need to add a halt.local service.

4 files changed, 4 insertions, 57 deletions

diff --git a/initscripts.spec b/initscripts.spec
index 8ef0b319..460c132b 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -234,10 +234,14 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/rc.d
 %dir /etc/rc.d/rc[0-9].d
 %config(missingok) /etc/rc.d/rc[0-9].d/*
+%exclude /etc/rc.d/rc[0-9].d/*reboot
+%exclude /etc/rc.d/rc[0-9].d/*halt
 /etc/rc[0-9].d
 %dir /etc/rc.d/init.d
 /etc/rc.local
 /etc/rc.d/init.d/*
+%exclude /etc/rc.d/init.d/halt
+%exclude /etc/rc.d/init.d/reboot
 %config(noreplace) /etc/rc.d/rc.local
 %config(noreplace) /etc/sysctl.conf
 %exclude /etc/profile.d/debug*
diff --git a/systemd/system/halt.service b/systemd/system/halt.service
deleted file mode 100644
index a1c0e84f..00000000
--- a/systemd/system/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 the system
-DefaultDependencies=no
-Requires=umount.target killall.service
-After=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/systemd/system/poweroff.service b/systemd/system/poweroff.service
deleted file mode 100644
index 28b4a5f4..00000000
--- a/systemd/system/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 down the system
-DefaultDependencies=no
-Requires=umount.target killall.service
-After=umount.target killall.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-Environment=RUNLEVEL=0
-ExecStart=/etc/init.d/halt start
-StandardOutput=tty
diff --git a/systemd/system/reboot.service b/systemd/system/reboot.service
deleted file mode 100644
index 622beb58..00000000
--- a/systemd/system/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 the system
-DefaultDependencies=no
-Requires=umount.target killall.service
-After=umount.target killall.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-Environment=RUNLEVEL=6
-ExecStart=/etc/init.d/reboot start
-StandardOutput=tty