From 3307aa6f852cd13f9f50a704099b2bf19b6b9439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Fri, 20 Jan 2012 19:13:23 -0500 Subject: Run vconfig only when the interface doesn't already exist. Now that a vlan interface can be created by a udev hook and ifupdown checks return codes from the scripts, make sure to properly deal with an already existing interface. --- debian/changelog | 8 ++++++++ debian/network/if-pre-up.d/vlan | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f7437f0..fc1c301 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +vlan (1.9-3.3) UNRELEASED; urgency=low + + * Now that a vlan interface can be created by a udev hook and + ifupdown checks return codes from the scripts, + make sure to properly deal with an already existing interface. + + -- Stéphane Graber Fri, 20 Jan 2012 19:13:23 -0500 + vlan (1.9-3.2) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/network/if-pre-up.d/vlan b/debian/network/if-pre-up.d/vlan index 1580fc2..1796988 100644 --- a/debian/network/if-pre-up.d/vlan +++ b/debian/network/if-pre-up.d/vlan @@ -49,7 +49,7 @@ case "$IFACE" in ;; esac -if [ -n "$IF_VLAN_RAW_DEVICE" ]; then +if [ -n "$IF_VLAN_RAW_DEVICE" ] && [ ! -d /sys/class/net/$IFACE ]; then if [ ! -x /sbin/vconfig ]; then exit 0 fi -- cgit v1.2.3 From b4c7eb84e369d2a56cd3f444d8cc450dc67f04b4 Mon Sep 17 00:00:00 2001 From: Dan Streetman Date: Thu, 8 Sep 2016 12:47:31 -0400 Subject: Increase raw device MTU when needed. If VLAN is configured with higher MTU than raw device MTU, which can happen if VLAN is ifup'ed before raw device, then increase raw device MTU first so the VLAN ifup does not fail. (LP: #1224007) --- debian/changelog | 10 ++++++++-- debian/network/if-pre-up.d/vlan | 8 ++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fc1c301..e2d0b4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,16 @@ -vlan (1.9-3.3) UNRELEASED; urgency=low +vlan (1.9-3.3) UNRELEASED; urgency=medium + [ Stéphane Graber ] * Now that a vlan interface can be created by a udev hook and ifupdown checks return codes from the scripts, make sure to properly deal with an already existing interface. - -- Stéphane Graber Fri, 20 Jan 2012 19:13:23 -0500 + [ Dan Streetman ] + * If VLAN is configured with higher MTU than raw device MTU, which can + happen if VLAN is ifup'ed before raw device, then increase raw device + MTU first so the VLAN ifup does not fail. (LP: #1224007) + + -- Dan Streetman Thu, 08 Sep 2016 12:47:31 -0400 vlan (1.9-3.2) unstable; urgency=medium diff --git a/debian/network/if-pre-up.d/vlan b/debian/network/if-pre-up.d/vlan index 1796988..675d01b 100644 --- a/debian/network/if-pre-up.d/vlan +++ b/debian/network/if-pre-up.d/vlan @@ -49,6 +49,14 @@ case "$IFACE" in ;; esac +if [ -n "$IF_MTU" -a -n "$IF_VLAN_RAW_DEVICE" ]; then + CUR_DEV_MTU=`cat /sys/class/net/$IF_VLAN_RAW_DEVICE/mtu` + # increase the vlan raw device mtu if needed + if [ -n "$CUR_DEV_MTU" ] && [ $CUR_DEV_MTU -lt $IF_MTU ]; then + ip link set dev $IF_VLAN_RAW_DEVICE mtu $IF_MTU + fi +fi + if [ -n "$IF_VLAN_RAW_DEVICE" ] && [ ! -d /sys/class/net/$IFACE ]; then if [ ! -x /sbin/vconfig ]; then exit 0 -- cgit v1.2.3 From 089eb2188b3ddcf1c5d01d257ec75e4afe4bc1e0 Mon Sep 17 00:00:00 2001 From: Dan Streetman Date: Wed, 20 Sep 2017 09:30:21 -0400 Subject: Allow ip-rp-filter to be 0, 1, or 2 instead of only 0 or 1 LP: #1716964 --- debian/changelog | 4 +++- debian/network/if-up.d/ip | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e2d0b4c..720b033 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,10 @@ vlan (1.9-3.3) UNRELEASED; urgency=medium * If VLAN is configured with higher MTU than raw device MTU, which can happen if VLAN is ifup'ed before raw device, then increase raw device MTU first so the VLAN ifup does not fail. (LP: #1224007) + * Allow ip-rp-filter to be 0, 1, or 2 instead of only 0 or 1 + (LP: #1716964) - -- Dan Streetman Thu, 08 Sep 2016 12:47:31 -0400 + -- Dan Streetman Thu, 30 Mar 2017 09:16:10 -0400 vlan (1.9-3.2) unstable; urgency=medium 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 -- cgit v1.2.3 From 4f46208e18b7fa96ce0e38894c15616e1dd949de Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Sun, 26 Nov 2017 10:58:49 +0000 Subject: Update the changelog. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 720b033..862b1e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -vlan (1.9-3.3) UNRELEASED; urgency=medium +vlan (1.9-3.3) unstable; urgency=medium [ Stéphane Graber ] * Now that a vlan interface can be created by a udev hook and @@ -12,7 +12,7 @@ vlan (1.9-3.3) UNRELEASED; urgency=medium * Allow ip-rp-filter to be 0, 1, or 2 instead of only 0 or 1 (LP: #1716964) - -- Dan Streetman Thu, 30 Mar 2017 09:16:10 -0400 + -- Andrew Shadura Sun, 26 Nov 2017 10:58:34 +0000 vlan (1.9-3.2) unstable; urgency=medium -- cgit v1.2.3