diff --git a/docs/Anatomy.xml b/docs/Anatomy.xml
index 720f31954..c386bddb9 100644
--- a/docs/Anatomy.xml
+++ b/docs/Anatomy.xml
@@ -106,8 +106,17 @@
url="Install.htm#idp8774904608">configure scripts included with Shorewall
Core.
+
+ Since Shorewall 4.5.2, each of these directories is now
+ relocatable using the configure
+ scripts included with Shorewall Core. These scripts set shell
+ variables in the shorewallrc file which is normally installed in
+ /usr/share/shorewall/. The name of the variable is included in
+ parentheses in the section headings below.
+
+
- /sbin
+ /sbin ($SBINDIR)
The /sbin/shorewall shell program is used to
interact with Shorewall. See
- /usr/share/shorewall
+ /usr/share/shorewall (${SHAREDIR}/shorewall)
The bulk of Shorewall is installed here.
@@ -220,22 +229,28 @@
- /etc/shorewall
+ /etc/shorewall (${CONFDIR}/shorewall)
This is where the modifiable IPv4 configuration files are
installed.
- /etc/init.d or /etc/rc.d (depends on distribution)
+ /etc/init.d or /etc/rc.d (depends on distribution)
+ ($INITDIR)
An init script is installed here. Depending on the distribution,
it is named shorewall or
- rc.firewall.
+ rc.firewall. Only installed on systems where
+ systemd is not installed.
+
+ When systemd is installed, the Shorewall .service files are
+ installed in the directory specified by the SERVICEDIR variable in
+ /usr/share/shorewall/shorewallrc.
- /var/lib/shorewall
+ /var/lib/shorewall (${VARLIB}/shorewall)
Shorewall doesn't install any files in this directory but rather
uses the directory for storing state information. This directory may be
@@ -332,7 +347,7 @@
Shorewall6 installs its files in a number of directories:
- /sbin
+ /sbin ($SBINDIR)
The /sbin/shorewall6 shell program is used to
interact with Shorewall6. See
- /usr/share/shorewall6
+ /usr/share/shorewall6 (${SHAREDIR}/shorewall6)
The bulk of Shorewall6 is installed here.
@@ -417,14 +432,28 @@
- /etc/shorewall6
+ /etc/shorewall6 (${CONFDIR}/
This is where the modifiable IPv6 configuration files are
installed.
+
+ /etc/init.d or /etc/rc.d (depends on distribution)
+ ($INITDIR)
+
+ An init script is installed here. Depending on the distribution,
+ it is named shorewall6 or
+ rc.firewall. Only installed on systems where
+ systemd is not installed.
+
+ When systemd is installed, the Shorewall .service files are
+ installed in the directory specified by the SERVICEDIR variable in
+ /usr/share/shorewall/shorewallrc.
+
+
- /var/lib/shorewall6
+ /var/lib/shorewall6 (${VARLIB}/shorewall6)
Shorewall6 doesn't install any files in this directory but rather
uses the directory for storing state information. This directory may be
@@ -514,7 +543,7 @@
in the sub-sections that follow.
- /sbin
+ /sbin ($SBINDIR_
The /sbin/shorewall-lite shell program is
used to interact with Shorewall lite. See
- /etc/init.d or /etc/rc.d (depends on distribution)
+ /etc/init.d or /etc/rc.d (depends on distribution)
+ ($INITDIR)
An init script is installed here. Depending on the distribution,
it is named shorewall-lite or
- rc.firewall.
+ rc.firewall. Only installed on systems where
+ systemd is not installed.
+
+ When systemd is installed, the Shorewall .service files are
+ installed in the directory specified by the SERVICEDIR variable in
+ /usr/share/shorewall/shorewallrc.
- /etc/shorewall-lite
+ /etc/shorewall-lite (${CONFDIR}/shorewall-lite)
This is where the modifiable configuration files are
installed.
- /usr/share/shorewall-lite
+ /usr/share/shorewall-lite (${SHAREDIR}/shorewall-lite)
The bulk of Shorewall-lite is installed here.
@@ -586,7 +621,7 @@
- /var/lib/shorewall-lite
+ /var/lib/shorewall-lite (${VARLIB}/shorewall-lite)
Shorewall-lite doesn't install any files in this directory but
rather uses the directory for storing state information. This directory
@@ -719,15 +754,29 @@
rc.firewall.
+
+ /etc/init.d or /etc/rc.d (depends on distribution)
+ ($INITDIR)
+
+ An init script is installed here. Depending on the distribution,
+ it is named shorewall6-lite or
+ rc.firewall. Only installed on systems where
+ systemd is not installed.
+
+ When systemd is installed, the Shorewall .service files are
+ installed in the directory specified by the SERVICEDIR variable in
+ /usr/share/shorewall/shorewallrc.
+
+
- /etc/shorewall6-lite
+ /etc/shorewall6-lite (${CONFDIR}/shorewall6-lite)
This is where the modifiable configuration files are
installed.
- /usr/share/shorewall6-lite
+ /usr/share/shorewall6-lite (${SHAREDIR}/shorewall6-lite)
The bulk of Shorewall-lite is installed here.
@@ -776,7 +825,7 @@
- /var/lib/shorewall6-lite
+ /var/lib/shorewall6-lite (${VARLIB}/shorewall6-lite)
Shorewall6-lite doesn't install any files in this directory but
rather uses the directory for storing state information. This directory
diff --git a/docs/bridge-Shorewall-perl.xml b/docs/bridge-Shorewall-perl.xml
index 903ea0174..ab465783d 100644
--- a/docs/bridge-Shorewall-perl.xml
+++ b/docs/bridge-Shorewall-perl.xml
@@ -102,12 +102,9 @@
Your kernel must contain Netfilter physdev match support
(CONFIG_IP_NF_MATCH_PHYSDEV=m or CONFIG_IP_NF_MATCH_PHYSDEV=y).
- Physdev match is standard in the 2.6 kernel series but must be patched
- into the 2.4 kernels (see http://bridge.sf.net). Bering and
- Bering uCLibc users must find and install ipt_physdev.o for their
- distribution and add ipt_physdev
to
- /etc/modules.
+ Physdev match is standard in the 2.6 and later kernel series but must
+ be patched into the 2.4 kernels (see http://bridge.sf.net).