From: Stefan Schantl <Stevee@ipfire.org>
Date: Mon, 24 Aug 2009 10:29:53 +0000 (+0200)
Subject: Readded halt binary to upstart and remove poweroff.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d84f146cd51e0e49b4d56e7343e6542a7e7319d;p=ipfire-3.x.git

Readded halt binary to upstart and remove poweroff.
---

diff --git a/lfs/upstart b/lfs/upstart
index 5d43408dc..e537b1036 100644
--- a/lfs/upstart
+++ b/lfs/upstart
@@ -93,7 +93,7 @@ $(OBJECT): $(objects)
 	cd $(DIR_APP) && make install
 
 	# These binaries are for the compatiblity mode, so we don´t need them
-	rm -vf /sbin/halt
+	rm -vf /sbin/poweroff
 	rm -vf /sbin/restart
 	rm -vf /sbin/runlevel
 	rm -vf /sbin/shutdown
diff --git a/src/rootfiles/core/upstart b/src/rootfiles/core/upstart
index 602f4dd82..74881ae1d 100644
--- a/src/rootfiles/core/upstart
+++ b/src/rootfiles/core/upstart
@@ -1,8 +1,8 @@
 etc/dbus-1/system.d/Upstart.conf
 etc/profile.d/upstart.sh
+sbin/halt
 sbin/init
 sbin/initctl
-sbin/poweroff
 sbin/reboot
 sbin/start
 sbin/status