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,11 @@ +vlan (1.9-3.2ubuntu2.16.10.2) yakkety; urgency=medium + + * Correct previous patch, to work for ifupdown configuration where a + vlan is configured but the vlan's raw device has no ifupdown config. + (LP: #1573272) + + -- Dan Streetman Mon, 29 May 2017 18:13:27 -0400 + vlan (1.9-3.2ubuntu2.16.10.1) yakkety; urgency=medium * In vlan ifupdown pre-up script, instead of calling ip link up for 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,7 +60,9 @@ exit 1 fi if [ ! -e "/sys/class/net/$IFACE" ]; then - ifup $IF_VLAN_RAW_DEVICE + # 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 vconfig add $IF_VLAN_RAW_DEVICE $VLANID fi fi