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 | 24cf2fc8938a6b2b41d11739b785ef05e63fe6b2 (patch) | |
| tree | 5a8f835885938154390f25dd5111c7c66e3868fa /sys-power/acpid | |
| parent | Keyword mips (diff) | |
| download | historical-24cf2fc8938a6b2b41d11739b785ef05e63fe6b2.tar.gz historical-24cf2fc8938a6b2b41d11739b785ef05e63fe6b2.tar.bz2 historical-24cf2fc8938a6b2b41d11739b785ef05e63fe6b2.zip | |
Use EnvironmentFile=-/etc/conf.d/acpid with - in case user has done something stupid like INSTALL_MASK="/etc/conf.d"
Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64
Diffstat (limited to 'sys-power/acpid')
| -rw-r--r-- | sys-power/acpid/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-power/acpid/Manifest | 18 | ||||
| -rw-r--r-- | sys-power/acpid/files/systemd/acpid.service | 2 |
3 files changed, 16 insertions, 11 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/Manifest b/sys-power/acpid/Manifest index aca2bd9dc8ce..36aa96fe7f2a 100644 --- a/sys-power/acpid/Manifest +++ b/sys-power/acpid/Manifest @@ -9,22 +9,22 @@ AUX acpid-2.0.16-conf.d 153 RMD160 7fe99acb5ca6327bbd80369000bad2c9771fe7d2 SHA1 AUX acpid-2.0.16-init.d 587 RMD160 0b8da06e95f82c3d472fcc55c586af61ee717248 SHA1 a7d3149979703270570cbc74b3df3b46b5fcec02 SHA256 980468e6bf96c7677898330cadbcff165b4d15f1197cd544548bd0f8c376983d AUX acpid-2.0.3.patch 881 RMD160 81a32d23d72e3104d67c37863f14aa88fe8b5b39 SHA1 ea9c629cbfed5f2e3e34c4d242fcff2b69fda51d SHA256 d313d9645e705221ef9f4610a0b127ee38240125d5e2f39554537bde38a7a813 AUX acpid.service 135 RMD160 dee559a0c4e8ae4372002851e518f1477ff1d1eb SHA1 47f40dee8d2e341b9c96f70a61439b6a1837dd52 SHA256 c01b8cc2532c4a130c020f042ab9e9be9a9ff075ad7c2e9c9f971a57b40b5cc6 -AUX systemd/acpid.service 145 RMD160 e0baaa8a1d78dab5b738cebc838d094293c572ec SHA1 6f8455090b18fe74fb2147b0b7070a4671947540 SHA256 598f907aeb8e7337cf78b25be2a942a010fe78155de98aa19068ad9cbee64a5c +AUX systemd/acpid.service 146 RMD160 bdee34d178a0e5ea8859d3651ef99fad7bb7266e SHA1 6ac9e67277ae3dfd6bef1af72111956b238f714e SHA256 41348a7d944d72eabb82a21ee55026b4d63fc3008cd0e44dd2c9dcde769ce689 AUX systemd/acpid.socket 127 RMD160 946eb954ad076f1154171aaf209f66b70f9793d7 SHA1 9d9e5b68cb717ee238f571babb2b0cd787e3990e SHA256 24c9d33b3ca4e5532a8dee84365d35b0aadbd6750bb4022f160c9def9f00104c DIST acpid-2.0.14.tar.gz 77395 RMD160 9ddd5018b92619b1d7434cbd219dc7a60bc56d82 SHA1 029d8c5045f417af1b2dd91462a263cfb1b3554a SHA256 88158b889280017072362b37a4b378826285756489857b93fc5888acf5b4db0b DIST acpid-2.0.16.tar.xz 148196 RMD160 240729f721dae0f5f5aab03573f536b6bd29177f SHA1 e795a5db1ba663417f91923154d0526212d37269 SHA256 94df0e73813a5dbaa1d7ae1049b3216b0cfd9d0843c89241080699ca62569808 EBUILD acpid-2.0.14.ebuild 1291 RMD160 1aded922eaa77658d1e9e73e5e43efb6bc6afd6c SHA1 b5c0a9f52e716abb9e5f586e610ced712c6c8b59 SHA256 835fed5765a0fab0e35282616e79b315bdde5243cee9364d0cd031057e763f84 EBUILD acpid-2.0.16-r1.ebuild 1451 RMD160 a2bc4aa31f444ea0a65482b19eba7d6e374a46ec SHA1 e76fb6230cd9555bf9ed482ee9f99c8953eebaa0 SHA256 c8fd77fd1e85166efb7d89f59a2e58c2c80e7b1494e0b02d7272b00ee2fa65c6 -MISC ChangeLog 15619 RMD160 5dda3712b29e8d63d82d994f6e8651a9112589ce SHA1 a4481a55740b0a3880fbc7befebdfab1364b748c SHA256 eebd54759d562d0c3a90b0aad8c6bb99434a1d504e8727b9fe31e274e4d0a338 +MISC ChangeLog 15826 RMD160 46c395423e36612b8fc1c76c8c16b35136fa962f SHA1 9abcc650c2e29484f0fc7856ddff0b008f4e2a09 SHA256 3d8e63552d7c3d22bcabde8708b3a804bc3e6c02554099aeae6ca239a7fdc4d4 MISC metadata.xml 161 RMD160 a5e1f234c4886ff31d39f229a0cf30d0bfcea869 SHA1 3876fd42cd9e63a7edb04c5025d53d773aa80bc3 SHA256 838bd208a7f948ea9b4e2b8869464622bc64a2f02468de4c3d7f6c2530e28e89 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBAgAGBQJPt24UAAoJEEdUh39IaPFNlrcH/1SJW0LqOneU5z+4voWH5sub -QEFxjcRS8RMBKKWSZy9LcfWLR+HkH9hZB3NEzt0rQOLTHzRrqpPEiCS/bTzUbXuH -s+d4QwJdz4tQ4OYCp8e7htMYAwabP/ASwiVgvbSkTcdIKxnTa6FmERTEdPFhTvEf -HUQpkjAdlhZZ7AB9vllsaLnoF95fxes+qUdwF/1gkycIylH+djG9PwemSS0ihBEG -bXWQJq+acjMPbvCUSVTzN7rsCJ1+3u6wiBTsK7TX43Ro7dO5prGuIMTyA3RLstxA -5lbNp1B4EW4oZUd74smZrxtslynIJsLe6v1CBPUT2ofdZ2pR9npglotY3DnK6LE= -=vjmY +iQEcBAEBAgAGBQJPt5Q5AAoJEEdUh39IaPFNPnoH+gKBwpIsRpR4BvemHu0Vu5BW +Lz3SsvpKUp2p9SakhqYJEJOMBg+vElyOvYGjwlU2l8KGYglJ97CHWsJ6qLVD4LhV +vw2bXcdVIMnRgU9qGK84chd6rEHQtfa7zW7pxHzKFFpaNeRzes2mFtzsMsrbVBpJ +GuYFcsHCdiu/VOwr6ewkwYvDZcVsFwYyuJMQghew53BnEQjGpNB8sytC+9MzZLrL +npqElgbjwJ51cuA9mkmqwXtLRf3sQTrjdrTE5Bbl9Aazcqs+JmGNflqS/wO1+USm +EAPtf0hRlNhT+5aH+Eg5mykoQ+xetH6q0i6nEoSW/acfdrv7uuPcsICb3ORrN9Y= +=yrHZ -----END PGP SIGNATURE----- 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 |