diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-05-19 12:38:28 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-05-19 12:38:28 +0000 |
| commit | 413b8309fdb7c789c1b413cd5eb6986ae8dc199b (patch) | |
| tree | 732cbfbc924aea869a7a23e4783d3546299b14bd /sys-power | |
| parent | Keyword mips (diff) | |
| download | gentoo-2-413b8309fdb7c789c1b413cd5eb6986ae8dc199b.tar.gz gentoo-2-413b8309fdb7c789c1b413cd5eb6986ae8dc199b.tar.bz2 gentoo-2-413b8309fdb7c789c1b413cd5eb6986ae8dc199b.zip | |
Use EnvironmentFile=-/etc/conf.d/acpid with - in case user has done something stupid like INSTALL_MASK="/etc/conf.d"
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'sys-power')
| -rw-r--r-- | sys-power/acpid/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-power/acpid/files/systemd/acpid.service | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sys-power/acpid/ChangeLog b/sys-power/acpid/ChangeLog index 10fcccea44b9..5b4d033b3025 100644 --- a/sys-power/acpid/ChangeLog +++ b/sys-power/acpid/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-power/acpid # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.86 2012/05/19 09:55:42 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.87 2012/05/19 12:38:28 ssuominen Exp $ + + 19 May 2012; Samuli Suominen <ssuominen@gentoo.org> + files/systemd/acpid.service: + Use EnvironmentFile=-/etc/conf.d/acpid with - in case user has done something stupid + like INSTALL_MASK="/etc/conf.d" 19 May 2012; Samuli Suominen <ssuominen@gentoo.org> -acpid-2.0.12.ebuild, -acpid-2.0.13.ebuild, -acpid-2.0.16.ebuild: diff --git a/sys-power/acpid/files/systemd/acpid.service b/sys-power/acpid/files/systemd/acpid.service index 8f8c7e4bede4..a29400948681 100644 --- a/sys-power/acpid/files/systemd/acpid.service +++ b/sys-power/acpid/files/systemd/acpid.service @@ -3,5 +3,5 @@ Description=ACPI Event Daemon Requires=acpid.socket [Service] -EnvironmentFile=/etc/conf.d/acpid +EnvironmentFile=-/etc/conf.d/acpid ExecStart=/usr/sbin/acpid -f $ACPID_ARGS |