From 373cf671c2f177c79ea56ee9c4067d4fb9251730 Mon Sep 17 00:00:00 2001
From: gdt <gdt>
Date: Fri, 6 Jan 2017 01:52:20 +0000
Subject: Change sub-daemon start order

Drop dependency of router, sm, s2s on c2s.  This did not make sense --
none of them care if c2s runs.

c2s, s2s, and sm all connect to router.  So make them depend on
router, even though in theory they should retry.

Make c2s depend on sm, because if someone tries to log in before sm is
running, they will get a failure, and some clients do not retry
correctly.  Getting ECONNREFUSED connecting to c2s is more likely to
be handled correctly.

No PKGREVISION; riding the impending update.

(Tested on netbsd-6 i386 in a domU.)
---
 chat/jabberd2/files/c2s.sh    | 4 ++--
 chat/jabberd2/files/router.sh | 4 ++--
 chat/jabberd2/files/s2s.sh    | 4 ++--
 chat/jabberd2/files/sm.sh     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/chat/jabberd2/files/c2s.sh b/chat/jabberd2/files/c2s.sh
index d5879d2dbef..ee10abcdf80 100755
--- a/chat/jabberd2/files/c2s.sh
+++ b/chat/jabberd2/files/c2s.sh
@@ -1,9 +1,9 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: c2s.sh,v 1.4 2010/06/10 10:36:22 adam Exp $
+# $NetBSD: c2s.sh,v 1.5 2017/01/06 01:52:20 gdt Exp $
 #
 # PROVIDE: c2s
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON router sm
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
diff --git a/chat/jabberd2/files/router.sh b/chat/jabberd2/files/router.sh
index 0a60641130b..f12b0298e74 100755
--- a/chat/jabberd2/files/router.sh
+++ b/chat/jabberd2/files/router.sh
@@ -1,9 +1,9 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: router.sh,v 1.2 2004/06/26 11:21:46 abs Exp $
+# $NetBSD: router.sh,v 1.3 2017/01/06 01:52:20 gdt Exp $
 #
 # PROVIDE: router
-# REQUIRE: DAEMON c2s
+# REQUIRE: DAEMON
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
diff --git a/chat/jabberd2/files/s2s.sh b/chat/jabberd2/files/s2s.sh
index adef244928e..6762b37c8cf 100755
--- a/chat/jabberd2/files/s2s.sh
+++ b/chat/jabberd2/files/s2s.sh
@@ -1,9 +1,9 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: s2s.sh,v 1.2 2004/06/26 11:21:46 abs Exp $
+# $NetBSD: s2s.sh,v 1.3 2017/01/06 01:52:20 gdt Exp $
 #
 # PROVIDE: s2s
-# REQUIRE: DAEMON c2s
+# REQUIRE: DAEMON router
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
diff --git a/chat/jabberd2/files/sm.sh b/chat/jabberd2/files/sm.sh
index fcee8f0f0bf..ce7ec066eae 100755
--- a/chat/jabberd2/files/sm.sh
+++ b/chat/jabberd2/files/sm.sh
@@ -1,9 +1,9 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: sm.sh,v 1.4 2009/08/21 02:28:12 schnoebe Exp $
+# $NetBSD: sm.sh,v 1.5 2017/01/06 01:52:20 gdt Exp $
 #
 # PROVIDE: sm
-# REQUIRE: DAEMON c2s
+# REQUIRE: DAEMON router
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
-- 
cgit v1.2.3