]> git.proxmox.com Git - mirror_ifupdown2.git/log
mirror_ifupdown2.git
9 years agoAdd check for shared dependents during building dependency list
Roopa Prabhu [Sat, 4 Apr 2015 04:24:25 +0000 (21:24 -0700)]
Add check for shared dependents during building dependency list

Testing Done: Tested with shared slaves in bridge and bonds
(cherry picked from commit 6f990450001d367a775681a29cdce74f862f7848)
(cherry picked from commit 8d9a5107112628ee8434e227dff49a0ef09966ee)

9 years agoDont follow dependents during down of interfaces as part of ifreload
Roopa Prabhu [Sat, 4 Apr 2015 03:47:06 +0000 (20:47 -0700)]
Dont follow dependents during down of interfaces as part of ifreload

Testing Done: tested ifreload with example in the bug

ifdown of the bridge svi was following the lowerdev and downing the
bridge. kernel implicitly deletes all svi's on bridge down.
ifup of the bridge usually handles it, but a change done in 2.5.1
was causing it not to. Thinking about this some more, its safe
to not follow dependents on down during a ifreload. This patch does
just that.
(cherry picked from commit 03f7a376aee944b4037b7b7b02a5096e9360f79e)
(cherry picked from commit aac5777ecc7d367ada0681f813fbec7f78fa80ee)

9 years agoifupdown2 loses interfaces on second down of swp port
Sam Tannous [Fri, 24 Apr 2015 00:19:22 +0000 (20:19 -0400)]
ifupdown2 loses interfaces on second down of swp port

Testing Done: tested bridge and bonds with interfaces with configs

Both bridge and mstpctl modules set priv_flags on interfaces
that have configs (like link-speed) even when used as bridge-ports.
And this collision causes statemanager.ifaceobj_sync() to never get called
because ifaceobj.priv_flags is 1 (we return immediately):
The fix was to create a new iface module_flags array to carry module info.
(cherry picked from commit 56924fef20984fd959939bf7f17c3dd6fd6b137a)
(cherry picked from commit 28d96f7643e2885b1f9c17ad9324a6dbb1b0f8c7)

9 years agoifupdown2: fixup maintainer scripts to not crash on files not existing
Jonathan Toppins [Mon, 20 Apr 2015 20:41:05 +0000 (13:41 -0700)]
ifupdown2: fixup maintainer scripts to not crash on files not existing

In addition fixed up the Debian maintainer scripts to prevent a
potential upgrade failure, discussion follows:

The Cause For the upgrade Failure
=================================

A commit introduced changes to
ifupdown2's package maintainer scripts to override some files provided
by the bridge-utils and udev packages as they conflict with ifupdown2.

The change to ifupdown2's postrm script is currently causing the script
to exit with a failure code if the following files do not exist on the
box:
/etc/udev/rules.d/80-networking.rules
/etc/udev/rules.d/60-bridge-network-interface.rules

The reason for this is in how the script is written.

Since the postrm script is configured to exit on the first command
failure, the "set -e" on line 3, the commands on lines 20 and 22 will
fail if the files being looked for do not exist, causing the script to
exit with a non-zero exit code. Causing apt to fail the upgrade.

.postrm script excerpt
----------
20 udevlink=$(readlink /etc/udev/rules.d/80-networking.rules 2>/dev/null)
21 [ -n "$udevlink" -a "$udevlink" == "/dev/null" ] && rm -f /etc/udev/rules.d/80-networking.rules
22 udevlink=$(readlink /etc/udev/rules.d/60-bridge-network-interface.rules 2>/dev/null)
23 [ -n "$udevlink" -a "$udevlink" == "/dev/null" ] && rm -f /etc/udev/rules.d/60-bridge-network-interface.rules
----------

Solution
--------

The solution requires having the newer version of the ifupdown2 package
provide a preinst script that gets run before the older package's postrm
script is run[1,2]. This gives us the opportunity to quietly fix the
problem. We also fix the postrm script in newer versions of the package
so it cannot bomb out in this way.

Finally, removed what appears to be a poor merge from commit
5f5d84e3261bf70dd3541666a3d3a7f817727ce6.

Fixes: 8959e8e4ec93487228733b17ef2b220ed47c1260
(cherry picked from commit 0eab79eb5aed4cdf0674e3f0ddad3631dd457bdc)

Conflicts:
packages/cl-utilities/debian/postinst
packages/cl-utilities/debian/prerm

9 years agoAdd config len check to iface compare
Roopa Prabhu [Sat, 4 Apr 2015 03:33:28 +0000 (20:33 -0700)]
Add config len check to iface compare

Testing Done: Tested ifreload with steps in the bug

9 years agoModified ifupdown support for vxlan head end replication
Wilson Kok [Wed, 15 Apr 2015 16:48:12 +0000 (09:48 -0700)]
Modified ifupdown support for vxlan head end replication

Replaced vxlan-peernodeip attribute with vxlan-remoteip.  Updated
the vxlan and iproute2 modules to configure head end replication
using bridge fdb commands.
(cherry picked from commit 567f445fc4a1828fc2aac0da3f2402a185656cb5)

Conflicts:
packages/ifupdown2/addons/vxlan.py
packages/ifupdown2/ifupdownaddons/iproute2.py

Conflicts:
ifupdown2/addons/vxlan.py
ifupdown2/ifupdownaddons/iproute2.py

9 years agoPrevent MTU from being set to 1500 on interface downing.
Sam Tannous [Wed, 18 Mar 2015 01:59:15 +0000 (21:59 -0400)]
Prevent MTU from being set to 1500 on interface downing.

MTU settings are defaulted 1500 when interface is ifdowned.
This has the effect of changing the MTU on the interface and any subinterfaces to
1500.  And if these subinterfaces are in a bridge, the bridge will pick the MIN MTU
so the bridge keeps this MTU even after the interface is brought back up. The sub
interface does not change to a higher value then 1500 (kernel VLAN driver only
moves the MTU is the decreasing direction.
(cherry picked from commit 70e67ab15efb13e1499288152d801b39f28a190b)
(cherry picked from commit 56238543a980e983957a180c583b9412c3ab48ab)

9 years agoCorrect error message for unsupported ifupdown2 attributes
Sam Tannous [Tue, 10 Mar 2015 20:46:07 +0000 (16:46 -0400)]
Correct error message for unsupported ifupdown2 attributes

Corrected a minor error in how we handle unsupported config attributes.
Instead of

     error: not enough arguments for format string

we will now print this:

     warning: peerlink.4000: unsupported attribute 'clagd-foobar'
(cherry picked from commit 44c6004a33d59ee234f8ee3d5f450e158c9e5bdc)
(cherry picked from commit f2c2321301d05e88d3c9ab9c26e6d4e256c884e9)

9 years agoRemove docs.addons since its now merged with the main ifupdown2
Roopa Prabhu [Tue, 10 Mar 2015 20:52:55 +0000 (13:52 -0700)]
Remove docs.addons since its now merged with the main ifupdown2
documentation in the docs dir

9 years agoMove python-ifupdown2 addons documentation into the ifupdown2 folder.
Roopa Prabhu [Tue, 10 Mar 2015 20:46:08 +0000 (13:46 -0700)]
Move python-ifupdown2 addons documentation into the ifupdown2 folder.

9 years agoRemove ifupdown2-addons (ifupdown2-addons contents are now merged into
Roopa Prabhu [Sun, 8 Mar 2015 17:04:54 +0000 (10:04 -0700)]
Remove ifupdown2-addons (ifupdown2-addons contents are now merged into
ifupdown2)

This simplifies ifupdown2 package management. Addon modules can be still
installed via third party modules outside of ifupdown2

9 years agoAdd note in readme regarding python-ifupdown2-addons being merged into
Roopa Prabhu [Sat, 7 Mar 2015 06:45:43 +0000 (22:45 -0800)]
Add note in readme regarding python-ifupdown2-addons being merged into
python-ifupdown2

9 years agoAdd note in readme regarding python-ifupdown2-addons being merged into
Roopa Prabhu [Sat, 7 Mar 2015 06:43:50 +0000 (22:43 -0800)]
Add note in readme regarding python-ifupdown2-addons being merged into
python-ifupdown2

9 years agoMerge 'vlan filtering bridge + vxlan + mlag + vrr' support from internal
Roopa Prabhu [Sat, 7 Mar 2015 05:46:10 +0000 (21:46 -0800)]
Merge 'vlan filtering bridge + vxlan + mlag + vrr' support from internal
tree to external

This also combines python-ifupdown2 and python-ifupdown2-addons package
into a single python-ifupdown2 package

9 years agoFix ifquery check for mstpctl-ports
Roopa Prabhu [Wed, 23 Jul 2014 22:15:53 +0000 (15:15 -0700)]
Fix ifquery check for mstpctl-ports

9 years agofew minor documentation cleanups
Roopa Prabhu [Tue, 22 Jul 2014 18:50:13 +0000 (11:50 -0700)]
few minor documentation cleanups

9 years agoInitial import of ifupdown2 sources
Roopa Prabhu [Sun, 20 Jul 2014 07:45:04 +0000 (00:45 -0700)]
Initial import of ifupdown2 sources

9 years agoInitial commit
nolanl [Sun, 20 Jul 2014 04:03:25 +0000 (21:03 -0700)]
Initial commit