diff -u vlan-1.9/debian/changelog vlan-1.9/debian/changelog --- vlan-1.9/debian/changelog +++ vlan-1.9/debian/changelog @@ -1,3 +1,10 @@ +vlan (1.9-3ubuntu10.4) trusty; urgency=medium + + * Don't trust ifup return code, as it returns 0 on failure; call ip link + set up after ifup to force vlan raw device up. (LP: #1573272) + + -- Dan Streetman Mon, 05 Jun 2017 12:12:01 -0400 + vlan (1.9-3ubuntu10.3) trusty; urgency=medium * Correct previous patch, to work for ifupdown configuration where a diff -u vlan-1.9/debian/network/if-pre-up.d/vlan vlan-1.9/debian/network/if-pre-up.d/vlan --- vlan-1.9/debian/network/if-pre-up.d/vlan +++ vlan-1.9/debian/network/if-pre-up.d/vlan @@ -60,9 +60,11 @@ exit 1 fi if [ ! -e "/sys/class/net/$IFACE" ]; then - # Try ifup for the raw device, if it fails then bring it up directly - # this is required e.g. there is no configuration for the raw device - ifup $IF_VLAN_RAW_DEVICE || ip link set up dev $IF_VLAN_RAW_DEVICE + # Try ifup for the raw device first; the return code can't be trusted + # on trusty because it returns 0 even on failure, so always bring it + # up directly also + ifup $IF_VLAN_RAW_DEVICE + ip link set up dev $IF_VLAN_RAW_DEVICE vconfig add $IF_VLAN_RAW_DEVICE $VLANID fi fi