diff options
| author | Dan Streetman <dan.streetman@canonical.com> | 2017-09-20 09:30:21 -0400 |
|---|---|---|
| committer | Dan Streetman <dan.streetman@canonical.com> | 2017-09-20 09:30:21 -0400 |
| commit | f2f33a15b1b4b5d09dcdbdbced0b20507a7fb07f (patch) | |
| tree | 6caf0043bc2b1f7b6f3dc2abdbc31b3723c59205 | |
| parent | 11e02c1c3f7c246a8e6ded4d22e8e2ce42a1b214 (diff) | |
Import Debian changes 1.9-3.2ubuntu5
vlan (1.9-3.2ubuntu5) artful; urgency=medium
* Allow ip-rp-filter to be 0, 1, or 2 instead of only 0 or 1
(LP: #1716964)
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/network/if-up.d/ip | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 393b76e..2adb287 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vlan (1.9-3.2ubuntu5) artful; urgency=medium + + * Allow ip-rp-filter to be 0, 1, or 2 instead of only 0 or 1 + (LP: #1716964) + + -- Dan Streetman <dan.streetman@canonical.com> Wed, 20 Sep 2017 09:30:21 -0400 + vlan (1.9-3.2ubuntu4) artful; urgency=medium * Correct previous patch, to work for ifupdown configuration where a diff --git a/debian/network/if-up.d/ip b/debian/network/if-up.d/ip index d7de05c..c155a7a 100644 --- a/debian/network/if-up.d/ip +++ b/debian/network/if-up.d/ip @@ -13,6 +13,8 @@ then if [ -n "$IF_IP_RP_FILTER" ]; then if [ "$IF_IP_RP_FILTER" -eq "0" ]; then echo 0 > "/proc/sys/net/ipv4/conf/$IFACE/rp_filter" + elif [ "$IF_IP_RP_FILTER" -eq "2" ]; then + echo 2 > "/proc/sys/net/ipv4/conf/$IFACE/rp_filter" else echo 1 > "/proc/sys/net/ipv4/conf/$IFACE/rp_filter" fi |