Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=3938af9a38de9f75d059ee601464f0a8c36ce18d
commit 3938af9a38de9f75d059ee601464f0a8c36ce18d
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Sun Jan 16 14:02:11 2011 +0100
acpid-1.0.10-4-i686
- systemd: don't continue before socket are available
- rc script: make options configurable via sysconfig file
diff --git a/source/base/acpid/FrugalBuild b/source/base/acpid/FrugalBuild
index 79e3e62..86ef2af 100644
--- a/source/base/acpid/FrugalBuild
+++ b/source/base/acpid/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=acpid
pkgver=1.0.10
-pkgrel=3
+pkgrel=4
pkgdesc="Utilities for using ACPI power management"
depends=('glibc>=2.8-3')
backup=(etc/acpi/acpi_handler.sh)
@@ -12,7 +12,7 @@ archs=('i686' 'x86_64' 'ppc')
_F_archive_grepv="20010510"
Finclude sourceforge
source=(${source[@]} rc.acpid rc.acpid-{de,hu,it}.po acpi_handler.sh default \
- acpid.service)
+ acpid.service acpid.sysconfig)
sha1sums=('743a11f34993cbd70f011d45634c4520e2d4d426' \
'009e8c404a93db943f57631bc95625609fb29255' \
'67c63dd3f5225c33170e1cfc549c0319ada21a84' \
@@ -20,7 +20,8 @@ sha1sums=('743a11f34993cbd70f011d45634c4520e2d4d426' \
'fd74c81eab81fad2eedf7f11ac14a33f97f2b213' \
'f232c48dbd9200e4ac79e2edc6ab5929835f42e0' \
'afac4fc82e6ca65d4a156f39016ee8d15c6eeabc' \
- '6e8e2fadb63903c8ed336a579aba9aa765b64d63')
+ 'a495000778e1de5d9be6ce08e3a03995a009de58' \
+ '3df42274f9459e12fc1abcf56f44de5d8bf13830')
build()
{
@@ -34,6 +35,7 @@ build()
Fexe /etc/acpi/events/default
Frcd2
Ffile /lib/systemd/system/acpid.service
+ Ffile acpid.sysconfig /etc/sysconfig/acpid
}
# optimization OK
diff --git a/source/base/acpid/acpid.service b/source/base/acpid/acpid.service
index ee590a4..553b3e2 100644
--- a/source/base/acpid/acpid.service
+++ b/source/base/acpid/acpid.service
@@ -10,8 +10,9 @@ After=syslog.target
# Type=simple here.
[Service]
-ExecStart=/usr/sbin/acpid -f
+Type=forking
+EnvironmentFile=/etc/sysconfig/acpid
+ExecStart=/usr/sbin/acpid $OPTIONS
[Install]
WantedBy=multi-user.target
-
diff --git a/source/base/acpid/acpid.sysconfig
b/source/base/acpid/acpid.sysconfig
new file mode 100644
index 0000000..f0d2bfb
--- /dev/null
+++ b/source/base/acpid/acpid.sysconfig
@@ -0,0 +1 @@
+OPTIONS=
diff --git a/source/base/acpid/rc.acpid b/source/base/acpid/rc.acpid
index 3478ac8..6b5f759 100644
--- a/source/base/acpid/rc.acpid
+++ b/source/base/acpid/rc.acpid
@@ -21,7 +21,8 @@ rc_start()
{
start_msg
if [ -d /proc/acpi ] && [[ "$(eval ${pid})" == "" ]] ; then
- /usr/sbin/acpid
+ [ -e /etc/sysconfig/acpid ] && source /etc/sysconfig/acpid
+ /usr/sbin/acpid $OPTIONS
ok $?
else
ok 999
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
