diff -Nru ifenslave-2.4ubuntu1.1/debian/changelog ifenslave-2.4ubuntu1.2/debian/changelog --- ifenslave-2.4ubuntu1.1/debian/changelog 2015-08-06 23:00:43.000000000 +0200 +++ ifenslave-2.4ubuntu1.2/debian/changelog 2015-10-21 14:19:59.000000000 +0200 @@ -1,3 +1,9 @@ +ifenslave (2.4ubuntu1.2) trusty; urgency=medium + + * Don't depend on /run/network/ifstate. (LP: #1337873) + + -- Dariusz Gadomski Thu, 01 Oct 2015 11:30:24 +0200 + ifenslave (2.4ubuntu1.1) trusty; urgency=medium * Fix change in /sys/class/net/{bond}/slave_ naming after kernel v3.13 diff -Nru ifenslave-2.4ubuntu1.1/debian/control ifenslave-2.4ubuntu1.2/debian/control --- ifenslave-2.4ubuntu1.1/debian/control 2014-03-03 16:31:21.000000000 +0100 +++ ifenslave-2.4ubuntu1.2/debian/control 2015-10-01 11:36:19.000000000 +0200 @@ -12,7 +12,7 @@ Package: ifenslave Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, ifupdown, iproute2 +Depends: ${misc:Depends}, ifupdown (>= 0.7.47~lp1337873~1), iproute2 Recommends: net-tools Breaks: ifenslave-2.6 (<< 1.1.0-22) Replaces: ifenslave-2.6 (<< 1.1.0-22) diff -Nru ifenslave-2.4ubuntu1.1/debian/ifenslave.if-post-down ifenslave-2.4ubuntu1.2/debian/ifenslave.if-post-down --- ifenslave-2.4ubuntu1.1/debian/ifenslave.if-post-down 2013-11-13 21:37:43.000000000 +0100 +++ ifenslave-2.4ubuntu1.2/debian/ifenslave.if-post-down 2015-10-01 11:33:17.000000000 +0200 @@ -2,6 +2,8 @@ [ "$VERBOSITY" = 1 ] && set -x +[ "$ADDRFAM" = meta ] && exit 0 + sysfs() { # Called with : @@ -25,7 +27,6 @@ } BOND_PARAMS="/sys/class/net/$IFACE/bonding" -IFSTATE=/run/network/ifstate # free $IFACE if it is currently enslaved to a bonding device. if [ -f "/sys/class/net/$IFACE/master/bonding/slaves" ] ; then @@ -53,9 +54,8 @@ [ "$VERBOSITY" = 1 ] && v=-v read slaves < "$BOND_PARAMS/slaves" for slave in $slaves ; do - # If $slave is currently up in $IFSTATE, then bring it down, to keep $IFSTATE consistent. # This is supposed to have the side effect of freeing the interface. - grep -q "^$slave=" $IFSTATE && ifdown $v $slave + ifquery --state $slave && ifdown $v $slave # Anyway, ensure $slave is free. if [ -f "/sys/class/net/$slave/master/bonding/slaves" ] ; then diff -Nru ifenslave-2.4ubuntu1.1/debian/ifenslave.if-pre-up ifenslave-2.4ubuntu1.2/debian/ifenslave.if-pre-up --- ifenslave-2.4ubuntu1.1/debian/ifenslave.if-pre-up 2013-11-13 21:46:56.000000000 +0100 +++ ifenslave-2.4ubuntu1.2/debian/ifenslave.if-pre-up 2015-10-01 11:34:09.000000000 +0200 @@ -2,7 +2,7 @@ [ "$VERBOSITY" = 1 ] && set -x -IFSTATE=/run/network/ifstate +[ "$ADDRFAM" = meta ] && exit 0 add_master() { @@ -145,7 +145,7 @@ [ "$VERBOSITY" = 1 ] && v=-v for slave in $BOND_SLAVES ; do - if ( [ "$AUTOIF" ] && grep -q "^$slave=" $IFSTATE ) ; then + if ( [ "$AUTOIF" ] && ifquery --state $slave ) ; then echo "Not enslaving interface $slave since it is already configured" else # Ensure $slave is down. diff -Nru ifenslave-2.4ubuntu1.1/debian/ifenslave.if-up ifenslave-2.4ubuntu1.2/debian/ifenslave.if-up --- ifenslave-2.4ubuntu1.1/debian/ifenslave.if-up 2013-11-13 21:37:43.000000000 +0100 +++ ifenslave-2.4ubuntu1.2/debian/ifenslave.if-up 2015-10-01 11:31:25.000000000 +0200 @@ -2,6 +2,8 @@ [ "$VERBOSITY" = 1 ] && set -x +[ "$ADDRFAM" = meta ] && exit 0 + sysfs() { # Called with :