diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | ifenslave | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 43ea933..1d64f4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ifenslave (2.7) unstable; urgency=low + + * Fix change in /sys/class/net/{bond}/slave_ naming after k3.13 + (Closes: #791906). Thanks, Louis Bouchard. + + -- Dmitry Smirnov <onlyjob@debian.org> Mon, 13 Jul 2015 21:02:29 +1000 + ifenslave (2.6) unstable; urgency=low * Added support for "packets_per_slave" option in interface stanza @@ -93,7 +93,8 @@ for slave in "$@"; do [ -d "/sys/class/net/$slave" ] || error "$slave: no such interface" if [ -z "$DETACH" ]; then - if [ -h "/sys/class/net/$master/slave_$slave" ]; then + if [ -h "/sys/class/net/$master/slave_$slave" ] || + [ -h "/sys/class/net/$master/lower_$slave" ]; then echo "$slave: already enslaved to $master" >&2 continue fi @@ -107,7 +108,8 @@ for slave in "$@"; do ip link set "$slave" down echo "+$slave" >"/sys/class/net/$master/bonding/slaves" || error "$slave: could not add interface" else - if [ ! -h "/sys/class/net/$master/slave_$slave" ]; then + if [ ! -h "/sys/class/net/$master/slave_$slave" ] || + [ ! -h "/sys/class/net/$master/lower_$slave" ]; then echo "$slave: is not enslaved to $master" >&2 continue fi |