Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 158466 | Differences between
and this patch

Collapse All | Expand All

(-)files/jabberd-2.0.11.init (-2 / +9 lines)
Lines 29-39 Link Here
29
start() {
29
start() {
30
30
31
	einfo "Starting Jabber Server ..."
31
	einfo "Starting Jabber Server ..."
32
	local services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1}')
32
	local services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}')
33
	local tempPidHack=/var/run/jabber/start_stop_daemon.pid
33
	eindent
34
	eindent
34
	for service in ${services}; do
35
	for service in ${services}; do
35
36
36
		cfgfile="$(grep "^${service}" /etc/jabber/jabberd.cfg | awk '{print $2}')"
37
		cfgfile=${service/*:/}
38
		service=${service/:*/}
37
		if [[ ! -f "${cfgfile}" ]]; then
39
		if [[ ! -f "${cfgfile}" ]]; then
38
			if [[ -f "/etc/jabber/${service}.xml" ]]; then
40
			if [[ -f "/etc/jabber/${service}.xml" ]]; then
39
				cfgfile="/etc/jabber/${service}.xml"
41
				cfgfile="/etc/jabber/${service}.xml"
Lines 52-68 Link Here
52
			return 1
54
			return 1
53
		fi
55
		fi
54
56
57
		rm -f ${tempPidHack} &> /dev/null
55
		ebegin "Starting ${service} (${cfgfile})"
58
		ebegin "Starting ${service} (${cfgfile})"
56
		start-stop-daemon \
59
		start-stop-daemon \
57
			--background \
60
			--background \
58
			--start  \
61
			--start  \
59
			--chuid jabber:jabber \
62
			--chuid jabber:jabber \
60
			--exec /usr/bin/${service} \
63
			--exec /usr/bin/${service} \
64
			--pid ${tempPidHack} \
65
			--make-pidfile \
61
			-- -c ${cfgfile}
66
			-- -c ${cfgfile}
62
		eend $?
67
		eend $?
68
		rm -f ${tempPidHack} &> /dev/null
63
69
64
	done
70
	done
65
	eoutdent
71
	eoutdent
72
66
}
73
}
67
74
68
stop() {
75
stop() {

Return to bug 158466