summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2012-12-24 10:07:19 +0000
committerLars Wendler <polynomial-c@gentoo.org>2012-12-24 10:07:19 +0000
commit3658562fe3a7e73509535088bfba0846f7f7f78d (patch)
treefbf689f45727f8bf9558c2e7438a6fc9d9f15d7a /app-misc/uptimed
parentVersion bump, drop old (diff)
downloadhistorical-3658562fe3a7e73509535088bfba0846f7f7f78d.tar.gz
historical-3658562fe3a7e73509535088bfba0846f7f7f78d.tar.bz2
historical-3658562fe3a7e73509535088bfba0846f7f7f78d.zip
Really fix init script this time.
Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64 Manifest-Sign-Key: 0x981CA6FC
Diffstat (limited to 'app-misc/uptimed')
-rw-r--r--app-misc/uptimed/ChangeLog5
-rw-r--r--app-misc/uptimed/Manifest30
-rw-r--r--app-misc/uptimed/files/uptimed.init12
3 files changed, 27 insertions, 20 deletions
diff --git a/app-misc/uptimed/ChangeLog b/app-misc/uptimed/ChangeLog
index 1397befe6f98..bba6430b134c 100644
--- a/app-misc/uptimed/ChangeLog
+++ b/app-misc/uptimed/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-misc/uptimed
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/ChangeLog,v 1.85 2012/12/24 09:27:05 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/ChangeLog,v 1.86 2012/12/24 10:07:16 polynomial-c Exp $
+
+ 24 Dec 2012; Lars Wendler <polynomial-c@gentoo.org> files/uptimed.init:
+ Really fix init script this time.
*uptimed-0.3.17-r1 (24 Dec 2012)
*uptimed-0.3.16-r6 (24 Dec 2012)
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index 4e802150975a..8c274a706315 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -1,27 +1,27 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX uptimed.init 602 SHA256 edc25d291faf24057cac36fafecdbc50ffdaf135bdf542a42f8f182efb2e67ef SHA512 e0ddb1135845f02c14d51c7063a5f4cd125446fa533ab3959256f1c798c02c9f1017be0c41a40c155ae1a0df16d0fdc58056b750124625435b9e1fca4fd99432 WHIRLPOOL d1116b9bc48175ebfabbfde8c0540ec4ae28f4e9150f0c3345b762b35146816a712bd6ed48c10a5c4aa2ca6bfa140bbf3faad78593562e3ec4f1c114a6cab3aa
+AUX uptimed.init 719 SHA256 b0ee567aff42da41bae2faf17acd1236a7c52814264500d57f9e88758df7e262 SHA512 3efd3453b6aaac3ca7d6673dd6fdeacc70704b2536f12d9a162532bb57dcbaf60cc705c013ed55d6a8e1192b86994aafaa711784b5f0f7085ab81b5a39d69ef2 WHIRLPOOL 53238f1553fe86b977bb0691fb301cfd608b1a848c091a9a7cbcf98eb864a85ff05e231a98f8d41bd047aaccfe7f28e82576c59ad547db525315a57bc2df4895
DIST uptimed-0.3.16.tar.bz2 197338 SHA256 f508ff5e98fab9c1bc0c342bf03cc6d1c01a24f2c7ab7ea8fcbfda477e16b12b SHA512 b6a51c0b30059767bd260b25cc43647c24f32bb9bcd5a3ff895ece800dbeb03d7de64cbdcec4f5571ea42ee72d38ea665733f59f74aecdc5e20a4e1c7b3a5123 WHIRLPOOL b7170beb21a742adcc0c25fb36636a3c4212727ba89b6585e4a0d066f2d323abcef6bbfa204c01afa82b92d6f958b354e9aeaad468c6384159e82cf5753396e2
DIST uptimed-0.3.17.tar.bz2 269102 SHA256 524ce8984c0d0a780a32025ba3ffb980e5eec3d78e65cf68c91edec7fe833a06 SHA512 d462fa435b07bc335738dfccddd374aaa94fe2671a652afb8cb85d5e69e2148c296dec2a575ef074675e64e5453cb2d0807f80b191d9aeb5233168a617e842c5 WHIRLPOOL 38ce1ec75a0a3b82d448d85f256dce4b77265e59dead4557c8a039056bd2f230355cffb90a776badc351315d072c10d227744905b8fcc6b3f6f32ac7d6492125
EBUILD uptimed-0.3.16-r6.ebuild 1285 SHA256 175cc8d41bd5dc39e3f9923b9a9b0b3e6c43b50c6e9d1c5d5d0271c173c2149f SHA512 f3e1b513561987de2f713b201ac9124700873fa5e7d3954f8021255469e90bd3a76d55614a90168175594d264c00ffc95b536eed8bba21b40182291cbaf73ba2 WHIRLPOOL b4916f99ab2f5ad41bb1a4a5139b05383d1fc68592413adfcc39199aae0ce50a0e301208071eb079a25e9efb1b9a0d779e1a0abf098822914f35bb70fcd8f076
EBUILD uptimed-0.3.17-r1.ebuild 1292 SHA256 61ec411bbc5dc1b8ffcc4f1cf3cc6a05756178c616bdca7ccb37c03f09712e63 SHA512 34eb6afccef690ab7a81339e95731b523c6dddd985829eac14480df0e2f2da345c0723ec2802b5824f27c7e99af64a493faad44f7c1a83421280e8217e310e5c WHIRLPOOL 98b9019f13e9322276dc766c407d61e1553218b40a872b4eda9900385d4b939835b4f9bc348e7b8846e869f4e8ba9ff4def3dff27c6c9ea44e5a4bec9476dadc
-MISC ChangeLog 11092 SHA256 b9f46e2ad6d27926211ee0792ccdeca78a4d452b7ff6553a5b43d3aa4c6d58a6 SHA512 418715d5744fc303a287146018bf802f8fa3a8ebaa585f37a85ba51c9f2b473856576dc7b031bc517926b3ae8969652a11d6cab116f17d5b699abd42e816d1f1 WHIRLPOOL 909dd677460e50e88b0ab4c266443e2d99f7992be71e6ffa4044510fe6dfb41482313a401214c8e79e2159cebafc969447fe40fdecb541ccb624a79b638256b1
+MISC ChangeLog 11203 SHA256 db4d47c875520666ba67835b40d8d87f78b746f751f73de32b1c031d337c0a91 SHA512 57a63811484aadb00f8742032e773bbda78ebe3fe18ef6a12020ac03c1b002167f01d5a04382105c2d36db59da2a4a40a7bf02d8c3541b06f2a4a12d7f524ec6 WHIRLPOOL 1f430aba455356acc2e1ec3fcb9b258beb4d88fc8869f60c70c5c8b4ada33b33c968e6b96f778f870811fa8babb8228b62d328a2502408099f89d2c32e24cf35
MISC metadata.xml 237 SHA256 97e2852866e146fd242be6cddceb93aebc2b28056cdafa3ff688a0cfc97a5065 SHA512 d21eed02cc15021ad5f18c4c932afdf4d6cfbb64a243764b61914aac9e57f6089ebb9e3a37e136e5bb7bf4f28d29bba49279d52a75acc3a6f921c770213758a5 WHIRLPOOL 92462bf73803127a88d9e2a02503d36efd2b8f1c938f3f2c00145db02871ea9ce241eba371138b6ab80c4774f858250b5eba08886ff355c0f212bfbc2cda3d9f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJQ2B/rAAoJEPiazRVxLXTF6s4P/i3g94l3YkKJPp2o8ytoiEdr
-4TDyn9r2MJL+mJK015BBP1lURQhJC2Gv9kCCIFJMbh7VkSvP9FTngEWfcXuKusRV
-bVHQNfen/WnaqmCOYRXjcPUqnGhBxmD40FunLwH4GBkRw6fAfmOPZ/jryWO3RHH0
-sI5/zjSxWMQpAjLLmgfr3kuirFwlmOrC9SQMSvNr2MLJCX3tCK7wCmIdKvOUZlRL
-PAduZ2gxFDaHdJDelLjk1u2W01tuIMK4Oj0dz3j4kDXEtj9gf0y1bIUFyP/Yu5+Y
-qfWO1O1E7L2hW4ntShAMk2V/nTNKaDKFuZ+wKIofXvLf9XCvwg3gfSGXOw6Tftsv
-y+hDWj5hhFMmJVaPHX5Goj+K+L/lN9pXo3wLpxNQk7WZIp8q8xtjjKgEIZFesdaC
-t6hIdXmm46IgSnPDCwSr73jJNkEL+U5CBzqe1//tcEiRKyUjh3D6lYay6p95CQui
-p5AoKRVDjGppAQ342wmdsts1ORIeMVde/USlmgLY2MpVtgEF3RDFa14N0I1ZFE7m
-w61hPBW20ZsNsYUOYzF/GT8MTOE2s0dj6KdkJKGOFRKLhvOygSKAkjEu6wi908L3
-Jv37ojXpMJai6C3jrScPRzTX6Kb1/lvAxFLjXEuOJ/CxV1u7dQ3KmW/37sHVCXD6
-mth7cvHqElPVVrz9MRzH
-=jLqx
+iQIcBAEBCAAGBQJQ2ClVAAoJEPiazRVxLXTFpRkP/0zE6SglATp2pwINmiwkX8kY
+Lgi1TiZlvOSL8DNgM3ScmuD7oxgt2/Y/pfdGFXUUF/Dp+2gSQ2LxB3MIprF2tidZ
+qL0GXPO+fRlrkbW94eOcNqWtxRoxVyCxXBq0U45Jy1PJ1kuhlMDVltCzDgzWgIDy
+EOYftVyI2YLtyhTuZA5XjKq9Oht8km9IwJZ03sL55xxdqKxpnILQ5/zFMCFGzw7+
+dOtz8Y/Yd8ezI2Qm7XrSSrbCVFvv1OTyZhI3QCMzqBGThkxqcbqSAYpWrz779nHd
+YI6XGbQYttluHLymgqt2QrDwtC2HjNtGJH2oXNm3Tz8HtzbjCmRIo6FbLzkmlc9D
+4z672jUnn+OmzjiTH0zt8MfyPMiwCQVd/gm4D612QxvPX4XxdFS2RC12CkwOnSni
+Ib1t2FzwniUTAlAnWVA0oXsaPLUG4pQfaeoenwuH4QZuHCGO8YXqW569iFh8+ztM
+oGmjqOb2USVOCk4+8u+U4JOw7sU6zRg4gBaGYeztZDCRiP6j6zKoTQrGnrVVWxWM
+Dw54KJ+6HZkOD75b2BYi5iDhCSndSrs+PWMo1GlXHfvmnedjVe8OSPzCOpmxeu4U
+aH41e9VCKCxkdk3q+zxB+2YXedN/kfCUiY/fCg3WZs/nl/9waQH8T6Peaz3hKaTc
+tXSH4RfDvUi1SrDHSqxI
+=YEQY
-----END PGP SIGNATURE-----
diff --git a/app-misc/uptimed/files/uptimed.init b/app-misc/uptimed/files/uptimed.init
index 71c409778070..5e1ba1ef354f 100644
--- a/app-misc/uptimed/files/uptimed.init
+++ b/app-misc/uptimed/files/uptimed.init
@@ -1,19 +1,23 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/files/uptimed.init,v 1.6 2012/12/24 09:27:06 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/files/uptimed.init,v 1.7 2012/12/24 10:07:16 polynomial-c Exp $
+description="uptimed - a daemon to record uptime records"
pidfile="/var/run/uptimed/uptimed.pid"
command="/usr/sbin/uptimed"
command_args="-p ${pidfile}"
-ssd_pre_start_args="-u uptimed"
-start_stop_daemon_args="${ssd_pre_start_args} -p ${pidfile}"
+start_stop_daemon_args="-u uptimed"
start_pre() {
checkpath -d -o uptimed ${pidfile%/*}
# Initialize bootid
- start-stop-daemon --start ${ssd_pre_start_args} --exec ${command} \
+ start-stop-daemon --start ${start_stop_daemon_args} --exec ${command} \
-- -b \
|| eend $?
+
+ # Workaround so openrc doesn't see the service as crashed after start
+ # (bug #448382).
+ mark_service_stopped
}