From: Phil Blundell <philb@gnu.org>
Date: Sun, 28 Jan 2007 16:10:39 +0000 (+0000)
Subject: acpi: remove duplicate initscripts, remove "-s /var/run/.acpid.socket"
X-Git-Tag: Release-2010-05/1~9334
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fc1da58b2565180439dc6e900eaa61dc1f0a320;p=openembedded.git

acpi: remove duplicate initscripts, remove "-s /var/run/.acpid.socket"
from daemon options
---

diff --git a/packages/acpid/acpid-1.0.3/init b/packages/acpid/acpid-1.0.3/init
deleted file mode 100755
index 4937e71e9f..0000000000
--- a/packages/acpid/acpid-1.0.3/init
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh -e
-
-test -x /usr/sbin/acpid || exit 0
-test -d /proc/acpi || exit 0
-
-case "$1" in
-  start)
-    echo -n "Starting Advanced Configuration and Power Interface daemon: "
-    start-stop-daemon -S -x /usr/sbin/acpid -- -c /etc/acpi/events -s /var/run/.acpid.socket
-    echo "acpid."
-    ;;
-  stop)
-    echo -n "Stopping Advanced Configuration and Power Interface daemon: "
-    start-stop-daemon -K -x /usr/sbin/acpid
-    echo "acpid."
-    ;;
-  restart|force-reload) 
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "Usage: /etc/init.d/acpid {start|stop|restart|force-reload}"
-    exit 1
-esac
-
-exit 0
diff --git a/packages/acpid/acpid-1.0.4/init b/packages/acpid/acpid-1.0.4/init
deleted file mode 100755
index 4937e71e9f..0000000000
--- a/packages/acpid/acpid-1.0.4/init
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh -e
-
-test -x /usr/sbin/acpid || exit 0
-test -d /proc/acpi || exit 0
-
-case "$1" in
-  start)
-    echo -n "Starting Advanced Configuration and Power Interface daemon: "
-    start-stop-daemon -S -x /usr/sbin/acpid -- -c /etc/acpi/events -s /var/run/.acpid.socket
-    echo "acpid."
-    ;;
-  stop)
-    echo -n "Stopping Advanced Configuration and Power Interface daemon: "
-    start-stop-daemon -K -x /usr/sbin/acpid
-    echo "acpid."
-    ;;
-  restart|force-reload) 
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "Usage: /etc/init.d/acpid {start|stop|restart|force-reload}"
-    exit 1
-esac
-
-exit 0
diff --git a/packages/acpid/files/.mtn2git_empty b/packages/acpid/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/acpid/acpid-1.0.2/init b/packages/acpid/files/init
similarity index 95%
rename from packages/acpid/acpid-1.0.2/init
rename to packages/acpid/files/init
index 4937e71e9f..ef08b59596 100755
--- a/packages/acpid/acpid-1.0.2/init
+++ b/packages/acpid/files/init
@@ -6,7 +6,7 @@ test -d /proc/acpi || exit 0
 case "$1" in
   start)
     echo -n "Starting Advanced Configuration and Power Interface daemon: "
-    start-stop-daemon -S -x /usr/sbin/acpid -- -c /etc/acpi/events -s /var/run/.acpid.socket
+    start-stop-daemon -S -x /usr/sbin/acpid -- -c /etc/acpi/events
     echo "acpid."
     ;;
   stop)