From: | "Markos Chandras (hwoarang)" <hwoarang@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in app-misc/conmux/files: conmux-registry.initd conmux.initd |
Date: | Thu, 31 Oct 2013 20:02:01 |
Message-Id: | 20131031200154.22DE820047@flycatcher.gentoo.org |
1 | hwoarang 13/10/31 20:01:54 |
2 | |
3 | Modified: conmux-registry.initd conmux.initd |
4 | Log: |
5 | Revbump to fix helpers and drivers installation. Fix PATH in init scripts and typos |
6 | |
7 | (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!) |
8 | |
9 | Revision Changes Path |
10 | 1.2 app-misc/conmux/files/conmux-registry.initd |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/conmux/files/conmux-registry.initd?rev=1.2&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/conmux/files/conmux-registry.initd?rev=1.2&content-type=text/plain |
14 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/conmux/files/conmux-registry.initd?r1=1.1&r2=1.2 |
15 | |
16 | Index: conmux-registry.initd |
17 | =================================================================== |
18 | RCS file: /var/cvsroot/gentoo-x86/app-misc/conmux/files/conmux-registry.initd,v |
19 | retrieving revision 1.1 |
20 | retrieving revision 1.2 |
21 | diff -u -r1.1 -r1.2 |
22 | --- conmux-registry.initd 29 Oct 2013 21:12:58 -0000 1.1 |
23 | +++ conmux-registry.initd 31 Oct 2013 20:01:53 -0000 1.2 |
24 | @@ -14,15 +14,17 @@ |
25 | |
26 | start() { |
27 | checkconfig |
28 | - ebegin "Starting conmux daemon" |
29 | - touch ${CONMUX_REGISTRY_LOG} ${CONMUX_REGISTRY_FILE} |
30 | - start-stop-daemon -b --start -p /run/conmux-registry.pid \ |
31 | - --exec /usr/sbin/conmux-registry \ |
32 | - ${CONMUX_REGISTRY_PORT} ${CONMUX_REGISTRY_FILE} |
33 | + # Make sure conmux finds everything |
34 | + export PATH="${PATH}:/usr/share/conmux/drivers:/usr/share/conmux/helpers" |
35 | + ebegin "Starting conmux registry daemon" |
36 | + touch ${CONMUX_REGISTRY_LOG} |
37 | + start-stop-daemon -b -m --start -p /run/conmux-registry.pid \ |
38 | + --exec /usr/sbin/conmux-registry -- ${CONMUX_REGISTRY_PORT} \ |
39 | + ${CONMUX_REGISTRY_LOG} |
40 | } |
41 | |
42 | stop() { |
43 | - ebegin "Stopping conmux daemon" |
44 | + ebegin "Stopping conmux registry daemon" |
45 | start-stop-daemon --stop --pidfile /run/conmux-registry.pid |
46 | eend $? |
47 | } |
48 | |
49 | |
50 | |
51 | 1.2 app-misc/conmux/files/conmux.initd |
52 | |
53 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/conmux/files/conmux.initd?rev=1.2&view=markup |
54 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/conmux/files/conmux.initd?rev=1.2&content-type=text/plain |
55 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/conmux/files/conmux.initd?r1=1.1&r2=1.2 |
56 | |
57 | Index: conmux.initd |
58 | =================================================================== |
59 | RCS file: /var/cvsroot/gentoo-x86/app-misc/conmux/files/conmux.initd,v |
60 | retrieving revision 1.1 |
61 | retrieving revision 1.2 |
62 | diff -u -r1.1 -r1.2 |
63 | --- conmux.initd 29 Oct 2013 21:12:58 -0000 1.1 |
64 | +++ conmux.initd 31 Oct 2013 20:01:53 -0000 1.2 |
65 | @@ -19,14 +19,16 @@ |
66 | |
67 | start() { |
68 | checkconfig || exit 1 |
69 | - ebegin "Starting CONMUX daemon" |
70 | - start-stop-daemon -b --start -1 ${CONMUX_LOG} \ |
71 | + # Make sure conmux finds everything |
72 | + export PATH="${PATH}:/usr/share/conmux/drivers:/usr/share/conmux/helpers" |
73 | + ebegin "Starting conmux daemon" |
74 | + start-stop-daemon -m b --start -1 ${CONMUX_LOG} \ |
75 | -2 ${CONMUX_LOG} -p /run/conmux.pid \ |
76 | --exec /usr/sbin/conmux -- ${CONMUX_CONFIG} |
77 | } |
78 | |
79 | stop() { |
80 | - ebegin "Stopping CONMUX daemon" |
81 | + ebegin "Stopping conmux daemon" |
82 | start-stop-daemon --stop --pidfile /run/conmux.pid |
83 | eend $? |
84 | } |