diff options
| author | Stéphane Graber <stgraber@ubuntu.com> | 2012-01-20 19:13:23 -0500 |
|---|---|---|
| committer | Stéphane Graber <stgraber@ubuntu.com> | 2012-01-20 19:13:23 -0500 |
| commit | 8a90b082c9be09b51ae36acd6ecb512972bf054b (patch) | |
| tree | 7124528fd1f5821f22de81133a9abb7dd9637e68 | |
| parent | f254efaaa7540e83f6d17b6699c3ceff903c4bbf (diff) | |
Import Debian changes 1.9-3ubuntu5
vlan (1.9-3ubuntu5) precise; 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.
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/network/if-pre-up.d/vlan | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index b8f8f19..c241e93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +vlan (1.9-3ubuntu5) precise; 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 <stgraber@ubuntu.com> Fri, 20 Jan 2012 19:13:23 -0500 + vlan (1.9-3ubuntu4) precise; urgency=low * Add a udev trigger similar to bridge-utils' so vlan interfaces are diff --git a/debian/network/if-pre-up.d/vlan b/debian/network/if-pre-up.d/vlan index b977be8..b762af8 100644 --- a/debian/network/if-pre-up.d/vlan +++ b/debian/network/if-pre-up.d/vlan @@ -43,7 +43,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 |