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

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

polynomial-c    12/12/24 09:27:06

  Modified:             uptimed.init
  Log:
  Fixed init script so openrc no longer sees uptimed as crashed (bug #448382)
  
  (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x981CA6FC)

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

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

Index: uptimed.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/uptimed/files/uptimed.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- uptimed.init	19 Dec 2012 00:31:18 -0000	1.5
+++ uptimed.init	24 Dec 2012 09:27:06 -0000	1.6
@@ -1,18 +1,19 @@
 #!/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.5 2012/12/19 00:31:18 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/files/uptimed.init,v 1.6 2012/12/24 09:27:06 polynomial-c Exp $
 
 pidfile="/var/run/uptimed/uptimed.pid"
 command="/usr/sbin/uptimed"
 command_args="-p ${pidfile}"
-start_stop_daemon_args="--user uptimed"
+ssd_pre_start_args="-u uptimed"
+start_stop_daemon_args="${ssd_pre_start_args} -p ${pidfile}"
 
 start_pre() {
 	checkpath -d -o uptimed ${pidfile%/*}
 
 	# Initialize bootid
-	start-stop-daemon --start ${start_stop_daemon_args} --exec ${command} \
+	start-stop-daemon --start ${ssd_pre_start_args} --exec ${command} \
 		-- -b \
 			|| eend $?
 }