diff options
| author |   Stuart Shelton <stuart@shelton.me> | 2015-06-27 20:39:30 +0100 |
|---|---|---|
| committer | Stuart Shelton <stuart@shelton.me> | 2015-06-27 20:39:30 +0100 |
| commit | 236f5c282a5a7a391521407b8d25ccf7bed98d61 (patch) | |
| tree | 2826e53c89611bf13c54093d97c2e721c07fa179 /sys-power | |
| parent | Add sys-apps/openrc-0.16.4 (diff) | |
| download | srcshelton-236f5c282a5a7a391521407b8d25ccf7bed98d61.tar.gz srcshelton-236f5c282a5a7a391521407b8d25ccf7bed98d61.tar.bz2 srcshelton-236f5c282a5a7a391521407b8d25ccf7bed98d61.zip | |
Update files/apcupsd.init.4, affecting sys-power/apcupsd-3.14.10-r6, sys-power/apcupsd-3.14.12, sys-power/apcupsd-3.14.12-r1
Diffstat (limited to 'sys-power')
| -rw-r--r-- | sys-power/apcupsd/Manifest | 2 | ||||
| -rwxr-xr-x | sys-power/apcupsd/files/apcupsd.init.4 | 25 |
2 files changed, 15 insertions, 12 deletions
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest index fff5eb18..2b16cf6a 100644 --- a/sys-power/apcupsd/Manifest +++ b/sys-power/apcupsd/Manifest @@ -6,7 +6,7 @@ AUX apcupsd-udev.rules 328 SHA256 0865097a99b321301ec5b0bb51d0560a01df0a21cca0ee AUX apcupsd.conf 12471 SHA256 4dbb52c93728fb1daaa0a35b02c48fd10e3016b9d805e8dab0d68b237ea24eb9 SHA512 3b21f9ea39ceaebcaa330717ce1f68d77caeaaa957336560418dc793abf6a66175fa9dbcc739b0e9d9a7c14cc44fa48a69efbcabb27ed31f1f5e1de609cf6b40 WHIRLPOOL 79afe7f7e357b579a2e0a47a8ab612ec6c4356a1b0b622928b37f93d6f2a55c7d198e2b5d903e54f92108f3734b90a9f6b1963b13f56ad3dad9765bfd147123d AUX apcupsd.init.2a 844 SHA256 86be1bafb0cf72db61def444361c659e5c36d0e44b1a007772b3f49aa0e95bcb SHA512 e86dfc3b7b8a0dbca59225795a5e996176b9a064720f4c2f6c1efc27cdf2eb0ecbdb59180b24abde1af730b834303fdf31564ec3b86a46d29ebe19abfdd48494 WHIRLPOOL e7d1e8dcb61862061d1889436c9157d95ed6a86a60aca54a0dda2120f3f5410fb700c0d889841b2013808faa349f90033a34e53eecd407df4089c58fea551f56 AUX apcupsd.init.3 659 SHA256 c3186646f06666ebd1ef265f5f6d56aeff27587face610d5f73c625b5c6053cc SHA512 fdaf68b4191dd04616c81035f8cfeafccb400a55273675b4125e67d28c3d23dc08446805e6553c868abf474773ce3a1fb36acbfbad9b85e4b6a57b7a170e01b2 WHIRLPOOL 0ea76a163c008f01d0bf8aa09219cce3a4ba6ada9f88d70b660dc06815227df37fdc82eb1b6987ec76a2cafc4f9cafa842d4ad9d81d017ef1c6d450efb077bc8 -AUX apcupsd.init.4 1041 SHA256 29bcf22843bb915303bef645b60d035164bf0d8b629825841535f5108a6a8835 SHA512 67f3773bd88b6cae35d4f0e6a825fbb0b6095c5c78d090730e89a7760fcb12a462ad27f0a458c04e9681063c20fdf116f4b99b41c083c8e5100dac434f61498a WHIRLPOOL 14f6e0a429ef00214170c6d8d1c594c29ddcc172786a858ae6278dafa578d817b8e061e79274f2a667c4e9726f682603eb8ce99f593ebbd4c2f3f53e2feecc93 +AUX apcupsd.init.4 1229 SHA256 d3df1edf9fd2e4cc1912853f01b867974b455b94b78d358bb352fc3341eea6ca SHA512 fe48fbdaf11beb957f3c826f8cf03576c2ac78e1a2958d650bc56b068bd2f6b6c69e63912c1dba8cc487af72aa7d628e4ebb6331329c6b60c2b8d1c0e955d18d WHIRLPOOL a7b71094ca54d0966b84691e5f5aa960d32320a5bd8c716d40bf9e46a79dc104d2c064b3813a122c0e50b9f456cd6fabf07d0dc11f0296ec3fd2c156bb28dc74 AUX apcupsd.powerfail.init 520 SHA256 eee773aa07175674085cb0ab7ed2c071fcc04fc05383d368f38d056e7327ff35 SHA512 d946d9b3427e0269d87aba1d6048cc4c73d767b1f5bc7d112718b82ec60076123e302dc0a73a4e5bbb7d1137ff78fc87a61983622a765341cfd7a79dcd0817ad WHIRLPOOL 1639496c976c6b654c20b953d675916636e44e7e3097696850bd202c91a9ffb713b398a86a2777b93472bccd3179aa83fb63ce43a1bbbe47e99f320ba8282a9c AUX apcupsd.service 111 SHA256 fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d SHA512 011e3e52e7909f36fb73b6064277a69e5db41263cfc72bda07e326172396d5318cd2b050f1fb84c4cc6da7a247c0035c36c55322ffb234a1cfa7bf13ba492889 WHIRLPOOL 940b6eb812c010f32b4bf54fd3e1b8d0a47890fd88acd8451bccbf6d17ab894915b179c110dda561c120e346ed20ca481f47761b9a5bac1e3b323457fbbc6f5a DIST apcupsd-3.14.10.tar.gz 1336852 SHA256 0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032 SHA512 f95918bff783cb60fa40b03a532ee7447293b0542f44f2f9ecf36ee028df3aa414f01e2b834a28fc319d88ec2e84c81314cd546b5628554176f2ca47fdc66bbc WHIRLPOOL 1fb40a5199eb8dfcd287bab08c2bbf51f02a3657ba615e16395d5f377bc9a5b6144db24b83ef5e9172ff970a715f87f685118a035c00372c34702984fac02d38 diff --git a/sys-power/apcupsd/files/apcupsd.init.4 b/sys-power/apcupsd/files/apcupsd.init.4 index 3a0cd089..4caf4d27 100755 --- a/sys-power/apcupsd/files/apcupsd.init.4 +++ b/sys-power/apcupsd/files/apcupsd.init.4 @@ -8,14 +8,14 @@ if [ -z "${INSTANCE}" ] || [ "${SVCNAME}" = "apcupsd" ]; then INSTANCE="apcupsd" fi -dir="/var/run/apcupsd" +piddir="/var/run/apcupsd" depend() { use net } start_pre() { - checkpath -d -m 0775 -o root:uucp ${dir} + checkpath -d -m 0775 -o root:uucp ${piddir} } start() { @@ -23,27 +23,30 @@ start() { export SERVICE="${SVCNAME}" - if [ ! -d "${dir}" ]; then - einfo " Creating ${dir}" - /bin/mkdir -p "${dir}" - /bin/chown root:uucp "${dir}" - fi + local lockdir="$( grep -E '^\s*LOCKFILE\s+' "/etc/apcupsd/${INSTANCE}.conf" | sed -r 's/\s*LOCKFILE\s+//' )" + local dir + for dir in "${piddir}" "${lockdir}"; do + if [ ! -d "${dir}" ]; then + einfo " Creating ${dir}" + /bin/mkdir -p "${dir}" + fi + done + /bin/chown root:uucp "${piddir}" ebegin "Starting APC UPS daemon" start-stop-daemon \ - --start --pidfile "${dir}/${SVCNAME}.pid" \ + --start --pidfile "${piddir}/${SVCNAME}.pid" \ --exec /sbin/apcupsd -- \ -f "/etc/apcupsd/${INSTANCE}.conf" \ - -P "${dir}/${SVCNAME}.pid" + -P "${piddir}/${SVCNAME}.pid" eend $? } stop() { ebegin "Stopping APC UPS daemon" start-stop-daemon \ - --stop --pidfile "${dir}/${SVCNAME}.pid" \ + --stop --pidfile "${piddir}/${SVCNAME}.pid" \ --retry TERM/5/TERM/5 \ --exec /sbin/apcupsd eend $? } - |