summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaohiro Aota <naota@gentoo.org>2014-03-04 20:42:02 +0000
committerNaohiro Aota <naota@gentoo.org>2014-03-04 20:42:02 +0000
commit4cd0aea87d26e35932662957eba10a7bd7770d1e (patch)
treef8a752d3539391095886c2c5af0f4ef8c11d5d8d /net-misc
parentAdd ~mips keyword. (diff)
downloadgentoo-2-4cd0aea87d26e35932662957eba10a7bd7770d1e.tar.gz
gentoo-2-4cd0aea87d26e35932662957eba10a7bd7770d1e.tar.bz2
gentoo-2-4cd0aea87d26e35932662957eba10a7bd7770d1e.zip
Update init script to use dropbox itselfs pid file. #503300
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key F8551514)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/dropbox/ChangeLog5
-rw-r--r--net-misc/dropbox/files/dropbox.initd8
2 files changed, 8 insertions, 5 deletions
diff --git a/net-misc/dropbox/ChangeLog b/net-misc/dropbox/ChangeLog
index dd4e36edf667..a5d2990ab254 100644
--- a/net-misc/dropbox/ChangeLog
+++ b/net-misc/dropbox/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/dropbox
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/ChangeLog,v 1.48 2014/03/04 20:13:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/ChangeLog,v 1.49 2014/03/04 20:42:02 naota Exp $
+
+ 04 Mar 2014; Naohiro Aota <naota@gentoo.org> files/dropbox.initd:
+ Update init script to use dropbox itselfs pid file. #503300
04 Mar 2014; Agostino Sarubbo <ago@gentoo.org> dropbox-2.4.10.ebuild:
Stable for x86, wrt bug #500080
diff --git a/net-misc/dropbox/files/dropbox.initd b/net-misc/dropbox/files/dropbox.initd
index 9bdbb839677b..7bba8943e6ed 100644
--- a/net-misc/dropbox/files/dropbox.initd
+++ b/net-misc/dropbox/files/dropbox.initd
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/files/dropbox.initd,v 1.2 2012/07/25 02:39:58 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/files/dropbox.initd,v 1.3 2014/03/04 20:42:02 naota Exp $
PID_DIR=/var/run/dropbox
@@ -22,7 +22,6 @@ start() {
local homedir=$(eval echo ~${dbuser})
if test -d "${homedir}" && \
start-stop-daemon -S -b \
- -m --pidfile ${PID_DIR}/$dbuser.pid \
${tmpnice} ${tmpionice} \
-u ${dbuser} -v \
-e HOME=${homedir} \
@@ -50,8 +49,9 @@ stop() {
local retval=0
ebegin "Stopping dropbox"
for dbuser in ${DROPBOX_USERS}; do
+ local homedir=$(eval echo ~${dbuser})
start-stop-daemon --stop \
- --pidfile ${PID_DIR}/${dbuser}.pid || retval=$?
+ --pidfile ${homedir}/.dropbox/dropbox.pid || retval=$?
done
eend ${retval}
}