acpid: Add systemd unit file.

References #153.

diff --git a/pkgs/acpid/acpid.init b/pkgs/acpid/acpid.init
deleted file mode 100644 (file)
index 111bf47..0000000
--- a/pkgs/acpid/acpid.init
+++ /dev/null
@@ -1,8 +0,0 @@
-description            "Start the ACPI daemon"
-author                 "IPFire Team"
-
-start on stopped mountfs
-stop on kill-all-services
-
-exec /usr/sbin/acpid -f
-respawn

diff --git a/pkgs/acpid/acpid.nm b/pkgs/acpid/acpid.nm
index e0543c2b5a835f03f8c848746c4c6b2be3dc5ef3..876aa25980625c3fde9f6896e2d0a3553e3cf7ab 100644 (file)
--- a/pkgs/acpid/acpid.nm
+++ b/pkgs/acpid/acpid.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = acpid
 PKG_VER        = 2.0.8
-PKG_REL        = 1
+PKG_REL        = 2
 
 PKG_MAINTAINER =
 PKG_GROUPS     = Base System/Daemons

diff --git a/pkgs/acpid/power.sh b/pkgs/acpid/power.sh
index c279e4c8ed2c0ce432188a3cfe9c453ceb8e7b03..4fb9ae03c218ef658ed9f043a71ff02903c4a97b 100755 (executable)
--- a/pkgs/acpid/power.sh
+++ b/pkgs/acpid/power.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 # Shutdown the system immediately
-initctl emit shutdown
+shudown -h now

diff --git a/pkgs/acpid/systemd/acpid.service b/pkgs/acpid/systemd/acpid.service
new file mode 100644 (file)
index 0000000..553b3e2
--- /dev/null
+++ b/pkgs/acpid/systemd/acpid.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=ACPI Event Daemon
+After=syslog.target
+
+# This could probably benefit from socket activation, but honestly I think it
+# is time for acpid to go away, and hence I am not planning to spend the time
+# to add socket activation here. We use Type=forking to ensure that the
+# communication sockets are in place before boot proceeds with any service
+# needing this service. Would acpid support socket activation we could use
+# Type=simple here.
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/sysconfig/acpid
+ExecStart=/usr/sbin/acpid $OPTIONS
+
+[Install]
+WantedBy=multi-user.target