summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaohiro Aota <naota@gentoo.org>2012-08-18 14:29:19 +0000
committerNaohiro Aota <naota@gentoo.org>2012-08-18 14:29:19 +0000
commit68e513fc554f2382077abf5d94e6fc4174decb46 (patch)
tree2eb39059455eeef7785775c6463a82b54e885636 /app-i18n
parentStable for x86, wrt bug #428904 (diff)
downloadgentoo-2-68e513fc554f2382077abf5d94e6fc4174decb46.tar.gz
gentoo-2-68e513fc554f2382077abf5d94e6fc4174decb46.tar.bz2
gentoo-2-68e513fc554f2382077abf5d94e6fc4174decb46.zip
Fix init script not to use deprecated argument
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'app-i18n')
-rw-r--r--app-i18n/multiskkserv/ChangeLog6
-rw-r--r--app-i18n/multiskkserv/files/multiskkserv.initd13
2 files changed, 10 insertions, 9 deletions
diff --git a/app-i18n/multiskkserv/ChangeLog b/app-i18n/multiskkserv/ChangeLog
index db218c6b62f0..9e868e087935 100644
--- a/app-i18n/multiskkserv/ChangeLog
+++ b/app-i18n/multiskkserv/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-i18n/multiskkserv
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/multiskkserv/ChangeLog,v 1.16 2012/08/11 18:36:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/multiskkserv/ChangeLog,v 1.17 2012/08/18 14:29:19 naota Exp $
+
+ 18 Aug 2012; Naohiro Aota <naota@gentoo.org> files/multiskkserv.initd:
+ Fix init script not to use deprecated argument
11 Aug 2012; Agostino Sarubbo <ago@gentoo.org> multiskkserv-20100128.ebuild:
Stable for amd64, wrt bug #428872
@@ -64,4 +67,3 @@
multiskkserv-20020201.ebuild, files/cdb-0.75-errno.diff,
files/multiskkserv.conf, files/multiskkserv.initd:
New package, closing bug #23820
-
diff --git a/app-i18n/multiskkserv/files/multiskkserv.initd b/app-i18n/multiskkserv/files/multiskkserv.initd
index ee778171b094..f94c2a8316a7 100644
--- a/app-i18n/multiskkserv/files/multiskkserv.initd
+++ b/app-i18n/multiskkserv/files/multiskkserv.initd
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/multiskkserv/files/multiskkserv.initd,v 1.3 2004/07/14 21:26:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/multiskkserv/files/multiskkserv.initd,v 1.4 2012/08/18 14:29:19 naota Exp $
depend() {
need net
@@ -17,16 +17,15 @@ start() {
ebegin "Starting multiskkserv"
start-stop-daemon --start --quiet --background \
--make-pidfile --pidfile /var/run/multiskkserv.pid \
- --startas /usr/sbin/multiskkserv -- \
- -r /usr/share/skk ${SKKJISYO_CDB}
+ /usr/sbin/multiskkserv -- \
+ -r /usr/share/skk ${SKKJISYO_CDB}
eend $?
}
stop() {
ebegin "Stopping multiskkserv"
- start-stop-daemon --stop --quiet \
+ start-stop-daemon --stop --quiet -R 5 \
--pidfile /var/run/multiskkserv.pid \
- --startas /usr/sbin/multiskkserv
+ --exec /usr/sbin/multiskkserv
eend $?
- [ -e /var/run/multiskkserv.pid ] && rm /var/run/multiskkserv.pid
}