diff --git a/init.d/.gitignore b/init.d/.gitignore index 626d7a2e..a74b9601 100644 --- a/init.d/.gitignore +++ b/init.d/.gitignore @@ -2,7 +2,6 @@ bootmisc devfs dmesg fsck -halt hostname killprocs local diff --git a/init.d/Makefile.Linux b/init.d/Makefile.Linux index fa4a6d09..5e574264 100644 --- a/init.d/Makefile.Linux +++ b/init.d/Makefile.Linux @@ -4,9 +4,6 @@ SRCS+= devfs.in dmesg.in hwclock.in consolefont.in keymaps.in killprocs.in \ modules.in mount-ro.in mtab.in numlock.in procfs.in sysfs.in \ termencoding.in -# This really belongs with sysvinit -SRCS+= halt.in - .SUFFIXES: .Linux.in .Linux.in: sed ${SED_REPLACE} ${SED_EXTRA} $< > $@ diff --git a/init.d/halt.in b/init.d/halt.in deleted file mode 100644 index d92ce5fa..00000000 --- a/init.d/halt.in +++ /dev/null @@ -1,25 +0,0 @@ -#!@PREFIX@/sbin/runscript -# Copyright 2007-2008 Roy Marples -# All rights reserved. Released under the 2-clause BSD license. - -# This script really belongs with the Linux sysvinit package -description="Halt or reboot the host depending on sysvinit runlevel." - -depend() -{ - after * - use mount-ro - keyword noprefix -} - -start() -{ - case "${RUNLEVEL}" in - 0) runlevel=shutdown;; - 6) runlevel=reboot;; - *) eerror "Unknown runlevel ${RUNLEVEL}"; return 1 - esac - - . /etc/init.d/"${runlevel}".sh - return 0 -} diff --git a/runlevels/Makefile.Linux b/runlevels/Makefile.Linux index 2143a7e0..9876cd2b 100644 --- a/runlevels/Makefile.Linux +++ b/runlevels/Makefile.Linux @@ -1,6 +1,3 @@ SYSINIT+= devfs dmesg BOOT+= hwclock keymaps modules mtab net.lo procfs termencoding SHUTDOWN+= killprocs mount-ro - -# This really belongs with sysvinit -SHUTDOWN+= halt