[gentoo-commits] gentoo-x86 commit in app-misc/uptimed/files: uptimed.init

["Lars Wendler (polynomial-c)" <polynomial-c@gentoo.org>]

polynomial-c    14/02/04 09:06:02

  Modified:             uptimed.init
  Log:
  Fixed pidfile location and removed obsolete code in init script
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

Revision  Changes    Path
1.9                  app-misc/uptimed/files/uptimed.init

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/uptimed/files/uptimed.init?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/uptimed/files/uptimed.init?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/uptimed/files/uptimed.init?r1=1.8&r2=1.9

Index: uptimed.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/uptimed/files/uptimed.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- uptimed.init	14 Jan 2013 18:08:59 -0000	1.8
+++ uptimed.init	4 Feb 2014 09:06:02 -0000	1.9
@@ -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
 }