Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-firewall/sanewall/files: sanewall.initd sanewall.confd
Date: Fri, 28 Nov 2014 17:04:12
Message-Id: 20141128170405.CAAE0B193@oystercatcher.gentoo.org
1 radhermit 14/11/28 17:04:05
2
3 Modified: sanewall.initd sanewall.confd
4 Log:
5 Add support to pass sanewall arguments (bug #493860).
6
7 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
8
9 Revision Changes Path
10 1.2 net-firewall/sanewall/files/sanewall.initd
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/sanewall/files/sanewall.initd?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/sanewall/files/sanewall.initd?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/sanewall/files/sanewall.initd?r1=1.1&r2=1.2
15
16 Index: sanewall.initd
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-firewall/sanewall/files/sanewall.initd,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- sanewall.initd 15 Jun 2013 11:07:43 -0000 1.1
23 +++ sanewall.initd 28 Nov 2014 17:04:05 -0000 1.2
24 @@ -1,7 +1,7 @@
25 #!/sbin/runscript
26 -# Copyright 1999-2013 Gentoo Foundation
27 +# Copyright 1999-2014 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/sanewall/files/sanewall.initd,v 1.1 2013/06/15 11:07:43 radhermit Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/sanewall/files/sanewall.initd,v 1.2 2014/11/28 17:04:05 radhermit Exp $
31
32 extra_commands="save panic try"
33 extra_started_commands="reload"
34 @@ -22,36 +22,36 @@
35
36 start() {
37 ebegin "Starting sanewall"
38 - /usr/sbin/sanewall ${SANEWALL_CONFIG} start >/dev/null
39 + /usr/sbin/sanewall ${SANEWALL_OPTS} ${SANEWALL_CONFIG} start >/dev/null
40 eend $?
41 }
42
43 stop() {
44 ebegin "Stopping sanewall"
45 - /usr/sbin/sanewall stop >/dev/null
46 + /usr/sbin/sanewall ${SANEWALL_OPTS} stop >/dev/null
47 eend $?
48 }
49
50 try() {
51 ebegin "Trying sanewall configuration"
52 - /usr/sbin/sanewall ${SANEWALL_CONFIG} try
53 + /usr/sbin/sanewall ${SANEWALL_OPTS} ${SANEWALL_CONFIG} try
54 eend $?
55 }
56
57 status() {
58 ebegin "Showing sanewall status"
59 - /usr/sbin/sanewall status
60 + /usr/sbin/sanewall ${SANEWALL_OPTS} status
61 eend $?
62 }
63
64 panic() {
65 ebegin "sanewall panic"
66 - /usr/sbin/sanewall panic
67 + /usr/sbin/sanewall ${SANEWALL_OPTS} panic
68 eend $?
69 }
70
71 save() {
72 ebegin "Saving sanewall configuration"
73 - /usr/sbin/sanewall save
74 + /usr/sbin/sanewall ${SANEWALL_OPTS} save
75 eend $?
76 }
77
78
79
80 1.2 net-firewall/sanewall/files/sanewall.confd
81
82 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/sanewall/files/sanewall.confd?rev=1.2&view=markup
83 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/sanewall/files/sanewall.confd?rev=1.2&content-type=text/plain
84 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/sanewall/files/sanewall.confd?r1=1.1&r2=1.2
85
86 Index: sanewall.confd
87 ===================================================================
88 RCS file: /var/cvsroot/gentoo-x86/net-firewall/sanewall/files/sanewall.confd,v
89 retrieving revision 1.1
90 retrieving revision 1.2
91 diff -u -r1.1 -r1.2
92 --- sanewall.confd 15 Jun 2013 11:07:43 -0000 1.1
93 +++ sanewall.confd 28 Nov 2014 17:04:05 -0000 1.2
94 @@ -1,2 +1,5 @@
95 # location of sanewall config
96 SANEWALL_CONFIG="/etc/sanewall/sanewall.conf"
97 +
98 +# arguments for sanewall
99 +#SANEWALL_OPTS=""