extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-10 23:58:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ignore SUBSYSLOCK when $SERVICEDIR is non-empty

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2017-01-06 15:50:26 -08:00
parent f68d3fd9fa
commit b8c322a05f
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Perl/prog.footer
View File

@ -130,6 +130,8 @@ g_docker=
g_dockernetwork= g_dockernetwork=
g_forcereload= g_forcereload=
[ -n "$SERVICEDIR" ] && SUBSYSLOCK=
initialize initialize
if [ -n "$STARTUP_LOG" ]; then if [ -n "$STARTUP_LOG" ]; then

16
Shorewall/manpages/shorewall.conf.xml
View File

@ -2570,9 +2570,19 @@ INLINE - - - ;; -j REJECT
<para>This parameter should be set to the name of a file that the <para>This parameter should be set to the name of a file that the
firewall should create if it starts successfully and remove when it firewall should create if it starts successfully and remove when it
stops. Creating and removing this file allows Shorewall to work with stops. Creating and removing this file allows Shorewall to work with
your distribution's initscripts. For RedHat and OpenSuSE, this your distribution's initscripts. For OpenSuSE, this should be set to
should be set to /var/lock/subsys/shorewall. For Debian, the value /var/lock/subsys/shorewall (var/lock/subsys/shorewall-lite if
is /var/lock/shorewall and in LEAF it is /var/run/shorewall.</para> building for export). For Gentoo, it should be set to
/run/lock/shorewall (/run/lock/shorewall-lite). For Redhat and
derivatives as well as Debian and derivatives, the pathname should
be omitted.</para>
<important>
<para>Beginning with Shorewall 5.1.0, this setting is ignored when
SERVICEDIR is non-empty in
<filename>${SHAREDIR}/shorewall/shorewallrc</filename> (usually
<filename>/usr/share/shorewall/shorewallrc</filename>).</para>
</important>
</listitem> </listitem>
</varlistentry> </varlistentry>

18
Shorewall6/manpages/shorewall6.conf.xml
View File

@ -2204,10 +2204,20 @@ INLINE - - - ;; -j REJECT
<listitem> <listitem>
<para>This parameter should be set to the name of a file that the <para>This parameter should be set to the name of a file that the
firewall should create if it starts successfully and remove when it firewall should create if it starts successfully and remove when it
stops. Creating and removing this file allows Shorewall6 to work stops. Creating and removing this file allows Shorewall to work with
with your distribution's initscripts. For RedHat, this should be set your distribution's initscripts. For OpenSuSE, this should be set to
to /var/lock/subsys/shorewall6. For Debian, the value is /var/lock/subsys/shorewall6 (var/lock/subsys/shorewall6-lite if
/var/lock/shorewall6 and in LEAF it is /var/run/shorewall.</para> building for export). For Gentoo, it should be set to
/run/lock/shorewall6 (/run/lock/shorewall6-lite). For Redhat and
derivatives as well as Debian and derivatives, the pathname should
be omitted.</para>
<important>
<para>Beginning with Shorewall 5.1.0, this setting is ignored when
SERVICEDIR is non-empty in
<filename>${SHAREDIR}/shorewall/shorewallrc</filename> (usually
<filename>/usr/share/shorewall/shorewallrc</filename>).</para>
</important>
</listitem> </listitem>
</varlistentry> </varlistentry>