Merge lp:~louis/ubuntu/wily/ifenslave/merge-debian-2.7 into lp:ubuntu/wily/ifenslave

[Louis Bouchard]

Merge from Debian

[Mathieu Trudel-Lapierre (cyphermox)]

The merge looks fine to me. Have you verified that ifenslave works properly after the merge? (a quite smoketest will suffice).

Just one thing, when you commit for a merge using bzr commit, see if you can remove the Debian entries or otherwise rearrange them so it's clear whether it's Debian or Ubuntu changes, since on top of a merge you might need to make extra changes.

review: Needs Information

[Louis Bouchard (louis)]

Correct.

So I installed wily with the archive's ifenslave-2.6 on a VM with 3 nics, setup bonding on two of them & rebooted. The bond comes up fine.

Then I installed the newly built ifenslave-2.7ubuntu1 and rebooted. The bond0 comes up correctly with the new version.

Regarding the log, I should have used debcommit -C, didn't know about this option.

Thanks.

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good, thanks!

review: Approve

=== modified file 'debian/README.Debian'
--- debian/README.Debian	2014-03-03 10:39:30 +0000
+++ debian/README.Debian	2015-07-24 10:36:06 +0000
@@ -3,12 +3,20 @@
 
 The ifenslave program distributed with the Linux kernel sources has not always
 been up to date, and several modified versions have been floating around. The
-latest kernels now contain an updated version though.  The Debian package
-ifenslave will now use the version found in the kernel, without any patches.
-
-You can also enslave interfaces using Debian's /etc/network/interfaces file
-by creating a stanza for the bonding interface and a stanza for each regular
-interface that should be enslaved to the bonding master.
+latest kernels now contain an updated version though, but the best way to
+configure bonding is via the files in /sys/class/net/$master/bonding/. This
+Debian package therefore does not contain the binary from the kernel sources,
+but provides a shell script with identical functionality.
+
+You can also enslave interfaces using Debian's /etc/network/interfaces file:
+
+- You can specify in the stanza of a bonding interface which slaves it
+  has.
+- You can specify in the stanza of a regular interface that it should be
+  enslaved to a bonding master.
+- You can setup the master interface mode and any other possible attribute
+  of the master in the stanza of a bonding interface or in the stanza of
+  the slaves of this interface.
 
 For a list of the supported bonding related options that can be used in
 /etc/network/interfaces, see "List of bonding related options" below.
@@ -217,5 +225,53 @@
 
 --------------------------------------------------------------------------------
 
-Guus Sliepen <[e-mail]>, Tue, 17 Mar 2009 18:33:43 +0100
+udev renaming issue
+===================
+
+"udev" assign network adapter names as per
+
+    /etc/udev/rules.d/70-persistent-net.rules
+
+where rule typically looks like this:
+
+    # PCI device 0x10ec:0x8168 (r8169)
+    SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="xx:xx:xx:xx:xx:xx", ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="eth*", NAME="eth0"
+
+The problem with bonding is that two or more NICs may have the very same
+MAC address which confuses udev when it tries to (re)name adapters as per
+their MACs and fails because another card with this MAC already exists.
+When it happens NIC may be left named like "rename2" instead of "eth0" etc.
+
+Possible solution is to change udev rule to assign network interface names
+as per NICs PCI IDs instead of MAC addresses. This can be done by replacing
+
+    ATTR{address}=="xx:xx:xx:xx:xx:xx"
+
+with something like
+
+    KERNELS=="0000:04:00.0"
+
+in the file "70-persistent-net.rules".
+Corresponding PCI IDs can be found in dmesg:
+
+    sudo dmesg | grep eth
+
+Where one can look for line fragment like this:
+
+    r8169 0000:04:00.0 eth0: RTL8168e/8111e
+#         ^^^^^^^^^^^^
+
+Alternatively PCI IDs can be found using `lspci -D | grep Ether`:
+
+    0000:04:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (rev 06)
+#   ^^^^^^^^^^^^
+
+--------------------------------------------------------------------------------
+
+See also:
+    https://wiki.debian.org/Bonding
+
+--------------------------------------------------------------------------------
+
+Guus Sliepen <[e-mail]>, Mon, 13 Jul 2012 13:50:13 +0200
 Nicolas de Pesloüan <[e-mail]>, Sun, 19 Dec 2010 19:00:00 +0100

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-02 15:39:48 +0000
+++ debian/changelog	2015-07-24 10:36:06 +0000
@@ -1,3 +1,37 @@
+ifenslave (2.7ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Upstart event based bond bringup:
+      + Drop ethernet+wifi example
+      + Drop two_ethernet example
+      + Update ethernet+hotplug_wifi example
+      + Update two_hotplug_ethernet example
+      + Update pre-up and post-down scripts for event bringup
+      + Update README.Debian examples
+    - Update scripts to use /run/network/ifstate instead of
+      /etc/network/run/ifstate
+    (LP: #1477928)
+
+ -- Louis Bouchard <[e-mail]>  Fri, 24 Jul 2015 12:04:56 +0200
+
+ifenslave (2.7) unstable; urgency=low
+
+  * Fix change in /sys/class/net/{bond}/slave_ naming after k3.13
+    (Closes: #791906). Thanks, Louis Bouchard.
+  * Standards-Version: 3.9.6.
+
+ -- Dmitry Smirnov <[e-mail]>  Mon, 13 Jul 2015 21:02:29 +1000
+
+ifenslave (2.6) unstable; urgency=low
+
+  * Added support for "packets_per_slave" option in interface stanza
+    (Closes: #758913); Thanks, John Holland.
+  * README.Debian:
+    + added note regarding "udev renaming issue".
+    + added "see also" note with link to "Bonding" section of wiki.
+
+ -- Dmitry Smirnov <[e-mail]>  Sun, 31 Aug 2014 11:05:09 +1000
+
 ifenslave (2.5ubuntu1) utopic; urgency=medium
 
   * Merge from Debian unstable. Remaining changes:

=== modified file 'debian/control'
--- debian/control	2014-05-02 15:39:48 +0000
+++ debian/control	2015-07-24 10:36:06 +0000
@@ -5,7 +5,7 @@
 XSBC-Original-Maintainer: Guus Sliepen <[e-mail]>
 Uploaders: Dmitry Smirnov <[e-mail]>
 Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/collab-maint/ifenslave.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/ifenslave.git
 

=== modified file 'debian/ifenslave.if-pre-up'
--- debian/ifenslave.if-pre-up	2014-05-02 15:39:48 +0000
+++ debian/ifenslave.if-pre-up	2015-07-24 10:36:06 +0000
@@ -196,6 +196,9 @@
 	# Mode should be set after miimon or arp_interval, to avoid a warning in syslog.
 	sysfs_change_down mode "$IF_BOND_MODE"
 
+	# packets_per_slave allowed for mode balance-rr only.
+	sysfs packets_per_slave "$IF_BOND_PACKETS_PER_SLAVE"
+
 	# arp_validate must be after mode (because mode must be active-backup).
 	sysfs arp_validate "$IF_BOND_ARP_VALIDATE"
 

=== modified file 'ifenslave'
--- ifenslave	2013-11-10 11:53:25 +0000
+++ ifenslave	2015-07-24 10:36:06 +0000
@@ -93,7 +93,8 @@
 	[ -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 @@
 		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