diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-04-04 10:58:23 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-04-04 10:58:23 +0000 |
| commit | 5292895fc48cf75e08668f1690393904da707eb0 (patch) | |
| tree | 65a5932456539b94031cfeda817a77760e8e31f6 /sys-power | |
| parent | fix detection of libavcodec 54 (diff) | |
| download | gentoo-2-5292895fc48cf75e08668f1690393904da707eb0.tar.gz gentoo-2-5292895fc48cf75e08668f1690393904da707eb0.tar.bz2 gentoo-2-5292895fc48cf75e08668f1690393904da707eb0.zip | |
sync the systemd files with original author, which just happens to be archlinux in this case. this means /etc/conf.d/acpid is now ignored. read ChangeLog for details
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-power')
| -rw-r--r-- | sys-power/acpid/ChangeLog | 10 | ||||
| -rw-r--r-- | sys-power/acpid/files/systemd/acpid.service | 9 | ||||
| -rw-r--r-- | sys-power/acpid/files/systemd/acpid.socket | 4 |
3 files changed, 17 insertions, 6 deletions
diff --git a/sys-power/acpid/ChangeLog b/sys-power/acpid/ChangeLog index e9d5181adcc9..120391a61f50 100644 --- a/sys-power/acpid/ChangeLog +++ b/sys-power/acpid/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-power/acpid # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.104 2013/03/15 20:50:03 miska Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.105 2013/04/04 10:58:23 ssuominen Exp $ + + 04 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> + files/systemd/acpid.service, files/systemd/acpid.socket: + Synchronize with original author of these files, which happens to be + ArchLinux in this case. See, + http://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/acpid + This means /etc/conf.d/acpid is now ignored in favour of copying the .service + file over to /etc/systemd/system for modifying. *acpid-2.0.18 (15 Mar 2013) diff --git a/sys-power/acpid/files/systemd/acpid.service b/sys-power/acpid/files/systemd/acpid.service index a29400948681..e4ddacdbead7 100644 --- a/sys-power/acpid/files/systemd/acpid.service +++ b/sys-power/acpid/files/systemd/acpid.service @@ -1,7 +1,10 @@ [Unit] -Description=ACPI Event Daemon +Description=ACPI event daemon Requires=acpid.socket [Service] -EnvironmentFile=-/etc/conf.d/acpid -ExecStart=/usr/sbin/acpid -f $ACPID_ARGS +ExecStart=/usr/sbin/acpid -f + +[Install] +WantedBy=multi-user.target +Also=acpid.socket diff --git a/sys-power/acpid/files/systemd/acpid.socket b/sys-power/acpid/files/systemd/acpid.socket index 5fa2e027de8a..1b23f8735d48 100644 --- a/sys-power/acpid/files/systemd/acpid.socket +++ b/sys-power/acpid/files/systemd/acpid.socket @@ -1,8 +1,8 @@ [Unit] -Description=ACPI Event Daemon Listen Socket +Description=ACPID Listen Socket [Socket] -ListenStream=/run/acpid.socket +ListenStream=/var/run/acpid.socket [Install] WantedBy=sockets.target |