diff --git a/docs/6to4.xml b/docs/6to4.xml
index 467e6a815..9c40edc4f 100644
--- a/docs/6to4.xml
+++ b/docs/6to4.xml
@@ -119,7 +119,7 @@ INTERFACES="eth2 eth4"
SLA=1
GATEWAY=::192.88.99.1
- eth3 is the interface to my local network (both wired and
+ eth2 is the interface to my local network (both wired and
wireless). eth4 goes to my DMZ which holds a single server. Here is a
diagram of the IPv4 network:
diff --git a/docs/MultiISP.xml b/docs/MultiISP.xml
index 2b2fad4b8..ece88b7c9 100644
--- a/docs/MultiISP.xml
+++ b/docs/MultiISP.xml
@@ -1040,7 +1040,12 @@ gateway:~ #Note that because we used a priority of 1000, the
All provider gateways must be specified explicitly in the
GATEWAY column. 'detect' may not be specified. Note that for ppp
- interfaces, the GATEWAY may remain unspecified ("-").
+ interfaces, the GATEWAY may remain unspecified ("-").
+ Beginning with Shorewall 4.2.6, 'detect' may be specified
+ for interfaces whose configuration is managed by dhcpcd.
+ Shorewall will use dhcpcd's database to determine the gateway IP
+ address.
+
@@ -1114,7 +1119,9 @@ COMMANDB="ip -$FAMILY route ls"
IF1=eth0
IF2=eth1
#
-# Sites to Ping. Must not depend on the associated interface having a default route through it.
+# Sites to Ping. Must depend only on routes in the 'main' routing table. If not specified,
+# the interface is assumed to be managed by dhcpcd and the script uses the gateway address
+# from /var/lib/dhcpcd/dhcpcd-${IFx}.info
#
TARGET1=
TARGET2=
@@ -1519,11 +1526,8 @@ Comcast 2 0x200 main eth3 detect track,balance
The loose option on Avvanta results
in fewer routing rules. The first two routing rules below insure that all
traffic from Avvanta-assigned IP addresses is sent via the Avvanta
- provider. Note that because the Comcast line has a dynamic IP address, I
- am not able to use USE_DEFAULT_RT=Yes in
- /etc/shorewall/shorewall.conf. The 'tun*' included in
- the COPY column is there because I run a routed OpenVPN server on the
- firewall.
+ provider. The 'tun*' included in the COPY column is there because I run a
+ routed OpenVPN server on the firewall.
/etc/shorewall/route_rules:
diff --git a/manpages/shorewall.conf.xml b/manpages/shorewall.conf.xml
index 56c25160f..7526a3384 100644
--- a/manpages/shorewall.conf.xml
+++ b/manpages/shorewall.conf.xml
@@ -1614,7 +1614,13 @@ net all DROP infothen the chain name is 'net2all'
All provider gateways must be specified explicitly in the
GATEWAY column. detect may not
- be specified.
+ be specified.
+ Beginning with Shorewall 4.2.6, detect may be specified for
+ interfaces whose configuration is managed by dhcpcd.
+ Shorewall will use dhcpcd's database to find the
+ interfaces's gateway.
+