Fixed pidfile location and removed obsolete code in init script

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 23 insertions, 22 deletions

diff --git a/app-misc/uptimed/ChangeLog b/app-misc/uptimed/ChangeLog
index 5260bf699ce0..2ac161944b6b 100644
--- a/app-misc/uptimed/ChangeLog
+++ b/app-misc/uptimed/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/uptimed
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/ChangeLog,v 1.98 2013/12/22 08:29:03 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/ChangeLog,v 1.99 2014/02/04 09:06:02 polynomial-c Exp $
+
+  04 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> files/uptimed.init:
+  Fixed pidfile location and removed obsolete code in init script.
 
 *uptimed-0.3.17-r2 (22 Dec 2013)
 
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index 60e4efa8cacd..8f1e49dd5983 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX uptimed.init 845 SHA256 687589dbae26e42af4d0693baad6ac86270b5eb2d2f5fcbacf3554a6cbd24f85 SHA512 513cffb666c821d60a2a1d5bbb36b854bff84c4249d8ac27779e82b5ca9e9824aa432c0812d247c469e9a9ab4dadf104cddaa8224b891e39d0a2c0ebc409134e WHIRLPOOL 44c3593a7ac3ac6976bd7cb8bb6fa02eda1ed552b2d4212e53dac05f51b8778e272942c16f48f8af0196f61ebcd970d99f8b3e725d15e6038dde194476442b0e
+AUX uptimed.init 484 SHA256 c6d6198fb77f1655d5e316d9303d76736dc5c21048b05bec500ecc8af61b4c84 SHA512 967e1407451887ec60fad9ebd58cfa59ff7569262b55a872892189bfe41bb91c0bcdd5dd6c18a8d1865f12013c3354f28874371b178e1b3a73fc6ee623cd94da WHIRLPOOL 82f3bde4dbba2a1a045dd41943cf64f7ae59b1ae3fe8bd048aaa099ceda96be355e4aa46d655cd7cbdb17ce3146d2025b6d5ee26a106823b0dd78cf5d4db246d
 AUX uptimed.service 209 SHA256 1be567def3288746970983ab6abe2c7c3cd304bb32a615430d7789298eb35d64 SHA512 949baf12782d4b8a976d29ec44bd31323500de763b82601634eea3721ce9035bb9b7ca906384e2b8ebd57371a1116a95dd78c3610c27fa1d93e36b9f897bcd98 WHIRLPOOL d38ab160b8957dce6edfd64f0d90239708fdeadac303b10e88fa4335295cb7638db077da7c8cb7a4b87a1f6ee1ff6efc452f25897d8db0beb1539fe21c5352b8
 DIST uptimed-0.3.17.tar.bz2 269102 SHA256 524ce8984c0d0a780a32025ba3ffb980e5eec3d78e65cf68c91edec7fe833a06 SHA512 d462fa435b07bc335738dfccddd374aaa94fe2671a652afb8cb85d5e69e2148c296dec2a575ef074675e64e5453cb2d0807f80b191d9aeb5233168a617e842c5 WHIRLPOOL 38ce1ec75a0a3b82d448d85f256dce4b77265e59dead4557c8a039056bd2f230355cffb90a776badc351315d072c10d227744905b8fcc6b3f6f32ac7d6492125
 EBUILD uptimed-0.3.17-r2.ebuild 1533 SHA256 6c7cca275e08429c03afe0577c26d7a4590b150a57c5bdc20d1278114e13ede8 SHA512 8e441cddb3d3895d171eed83a640c2bf49653a26f71865a8548f6673ab45782eb908172319c87b57fa6f001cc3e400d8cd8892ed77c62077e9ec80ba3df258d8 WHIRLPOOL ec0b1e3b16df79f6ed2fd26ef9976ad8008f6aaf2703d6ed7b344f1ad9e391ac4fd5c48c7d87f2c33955764e1f00a1eb247024e070e9b33fbbdce1db45e88303
-MISC ChangeLog 12966 SHA256 142df51367d0d0e2adcf2bfa457722c31fd365488904e96c3952a4ef77871dad SHA512 6fbdbef0c65880765a54253c6c4d7e5a763ae669069924d91bd612cae173c6c000428665a20469c09186ab751ecb02912e88192f5037aa3f11ea4a0ef72e611a WHIRLPOOL 5096a09d7e5bad1e660a04b5cc7c8f9732ef3abc6f38d27a1d02638a263dfd81dd864bac1ed280376a6a2f4b8cf6c53f50400906cc88cf3f26e174cc96764056
+MISC ChangeLog 13115 SHA256 928f2eadf972a08b02765dcecf9b76b31b3b9846fc2f8277235a6f45dc6f6e1f SHA512 3049236cf84de47bda5c5e277ed546eeeefa90eec8567ae1d041739fd4518fe7ae2954376a61d8d5ca81750b13f2c1f168de90656519e5ffacf73ac65dafc071 WHIRLPOOL d9c1b213815aba2c2295e4576524a427a7875ee440a3326281dab64ba2468f8dbc0a0de6f7657d561195df76f5f033d9606bb736ceb87cff07af9c41ff62f769
 MISC metadata.xml 237 SHA256 97e2852866e146fd242be6cddceb93aebc2b28056cdafa3ff688a0cfc97a5065 SHA512 d21eed02cc15021ad5f18c4c932afdf4d6cfbb64a243764b61914aac9e57f6089ebb9e3a37e136e5bb7bf4f28d29bba49279d52a75acc3a6f921c770213758a5 WHIRLPOOL 92462bf73803127a88d9e2a02503d36efd2b8f1c938f3f2c00145db02871ea9ce241eba371138b6ab80c4774f858250b5eba08886ff355c0f212bfbc2cda3d9f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK2otEACgkQCaWpQKGI+9S17gCffyexhBYhBcnAGwf4zo9cVhSd
-cqkAoIBFh90ufvnJiS1lUk4I4CgpiqBp
-=fQwk
+iQIcBAEBCAAGBQJS8K17AAoJEPiazRVxLXTF+tsQAJ4r5l/b7abru/DTg65eFUFd
+HA9c+Wi0vK4dVWzzrDW7GAtdtcW0MtJJBft3dK8vH88lYCBcygd2CUwAi5SKmH9Z
+9j175qIUk7G3SNBrP6IDuLMOSAcEwS+HIAm2XiftDp0lH9958QRSBDlcT8I3Lrpn
+wlnXq8PyxYbBSm8sujYqQaoZCRgPULoi5w/ZIRP5lFkie/erlO9boKnO1Bsm09u6
+3OOGoC34jwAzg+qA7U1ZMQzhhASdECSwnWLk/wKaWujCZI4gJHfgCLsBDxe1JCXZ
+eCwG2k9icvkq9ADQ/6DRCz2Quz6GU69WBT1RfHoFe7gC8DsqltrEN2rflS2LPFrf
+NjIG8FCqatZ1+NRJt7rwZsNuY4WwB+zWjJemRYdd1LFtw1Kxk41/75tMQ2lok7N0
+asjj5gtIliygeJ2rIdqiQ11D6YmVVe75vJRQmkhe7rypkuqkCf0BMaa4JvbW4poD
+g2/tOcC0a/XNr91v/QIXGqA+/SBuk+S5n5bpzowsoj5YkMv/hRmRkfgWyKDtJEuv
+gi7SIGb+o2vn8ygD7o9C0a3Gjp7HcUw4v9TJ65d0krG+mpXE11MldxRpvJBuwgQD
+SVsqn079TWRvLT7uaVRfkBvZv+SQi/vz4eLH/Ti94UCc52krVMBMpSd+zN2y+JRH
+7p6OTyRooMye4To9fjL3
+=vv2E
 -----END PGP SIGNATURE-----
diff --git a/app-misc/uptimed/files/uptimed.init b/app-misc/uptimed/files/uptimed.init
index 1a9307c5af08..7d0e22ceb991 100644
--- a/app-misc/uptimed/files/uptimed.init
+++ b/app-misc/uptimed/files/uptimed.init
@@ -1,26 +1,14 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.8 2013/01/14 18:08:59 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/files/uptimed.init,v 1.9 2014/02/04 09:06:02 polynomial-c Exp $
 
 description="uptimed - a daemon to record uptime records"
-pidfile="/var/run/uptimed/uptimed.pid"
+pidfile="/run/uptimed/uptimed.pid"
 command="/usr/sbin/uptimed"
 command_args="-p ${pidfile}"
 start_stop_daemon_args="-u uptimed"
 
 start_pre() {
 	checkpath -d -o uptimed ${pidfile%/*}
-
-	# Initialize bootid for uptimed < 0.3.17
-	local udver=$(${command} -v | head -n 1 | sed 's@.*[[:space:]]\([[:digit:]\.]\+\)[[:space:]].*@\1@;s@\.@@g')
-	local bootid="/var/spool/uptimed/bootid"
-	if [ "${udver}" -lt "0317" ] ; then
-		${command} -b || eend $?
-		checkpath -f -o uptimed ${bootid}
-	else
-		if [ -f "${bootid}" ] ; then
-			rm ${bootid}
-		fi
-	fi
 }