summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2012-12-24 10:07:16 +0000
committerLars Wendler <polynomial-c@gentoo.org>2012-12-24 10:07:16 +0000
commit083e4737c558334fcd0739f5c4380764377595b4 (patch)
treed35ec062595d660c02cad1b5f1c58ef876d576dc /app-misc/uptimed
parentVersion bump, drop old (diff)
downloadgentoo-2-083e4737c558334fcd0739f5c4380764377595b4.tar.gz
gentoo-2-083e4737c558334fcd0739f5c4380764377595b4.tar.bz2
gentoo-2-083e4737c558334fcd0739f5c4380764377595b4.zip
Really fix init script this time.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'app-misc/uptimed')
-rw-r--r--app-misc/uptimed/ChangeLog5
-rw-r--r--app-misc/uptimed/files/uptimed.init12
2 files changed, 12 insertions, 5 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/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
}