summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Erculiani <lxnay@gentoo.org>2010-07-28 14:15:12 +0000
committerFabio Erculiani <lxnay@gentoo.org>2010-07-28 14:15:12 +0000
commit875e4aa20de9af2971ad4a03d11484b31617c899 (patch)
tree5fb99a6ebf1dac35d480a5548cefd45197b3a0fb
parentUse dev-python/nose to run tests thanks to arfrever. (diff)
downloadgentoo-2-875e4aa20de9af2971ad4a03d11484b31617c899.tar.gz
gentoo-2-875e4aa20de9af2971ad4a03d11484b31617c899.tar.bz2
gentoo-2-875e4aa20de9af2971ad4a03d11484b31617c899.zip
fix start/stop scripts
(Portage version: 2.2_rc67/cvs/Linux x86_64)
-rw-r--r--net-nds/389-ds-base/ChangeLog6
-rw-r--r--net-nds/389-ds-base/files/restart-dirsrv3
-rw-r--r--net-nds/389-ds-base/files/start-dirsrv3
3 files changed, 9 insertions, 3 deletions
diff --git a/net-nds/389-ds-base/ChangeLog b/net-nds/389-ds-base/ChangeLog
index 19a8e964135f..d775c5aac9a4 100644
--- a/net-nds/389-ds-base/ChangeLog
+++ b/net-nds/389-ds-base/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-nds/389-ds-base
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/ChangeLog,v 1.5 2010/07/28 13:57:00 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/ChangeLog,v 1.6 2010/07/28 14:15:11 lxnay Exp $
+
+ 28 Jul 2010; Fabio Erculiani <lxnay@gentoo.org> files/restart-dirsrv,
+ files/start-dirsrv:
+ fix start/stop scripts
*389-ds-base-1.2.6_rc3-r1 (28 Jul 2010)
*389-ds-base-1.2.5-r1 (28 Jul 2010)
diff --git a/net-nds/389-ds-base/files/restart-dirsrv b/net-nds/389-ds-base/files/restart-dirsrv
index b4d57467b29e..90654eca170a 100644
--- a/net-nds/389-ds-base/files/restart-dirsrv
+++ b/net-nds/389-ds-base/files/restart-dirsrv
@@ -8,7 +8,8 @@
# 3: Server could not be stopped
sleep_time=8
-running=$(/etc/init.d/389-ds status &> /dev/null)
+/etc/init.d/389-ds status &> /dev/null
+running="${?}"
rc-config stop 389-ds
if [ "${?}" = "1" ]; then
diff --git a/net-nds/389-ds-base/files/start-dirsrv b/net-nds/389-ds-base/files/start-dirsrv
index 4d904b499dbd..45c2a6c2c7d4 100644
--- a/net-nds/389-ds-base/files/start-dirsrv
+++ b/net-nds/389-ds-base/files/start-dirsrv
@@ -7,7 +7,8 @@
# 2: Server already running
rc-config stop 389-ds
-rc=$(rc-config start 389-ds)
+rc-config start 389-ds
+rc="${?}"
# give the daemon a chance to start
sleep 8
exit "${rc:-1}"