mirror of
https://github.com/CumulusNetworks/ifupdown2.git
synced 2024-05-06 15:54:50 +00:00
Jonathan Toppins
ef7b7c04b4
ifupdown2: fixup maintainer scripts to not crash on files not existing
Ticket: CM-5735 Reviewed By: no one Testing Done: lots of repo upgrade testing by John B. This partially reverts commit 8959e8e4ec93487228733b17ef2b220ed47c1260 ("Fix bash completion for sudo users (mostly cosmetic)") in the sections where the Debian maintainer scripts were modified. In addition fixed up the Debian maintainer scripts to prevent a potential upgrade failure, discussion follows: The Cause For the upgrade Failure ================================= Commit 8959e8e4ec93487228733b17ef2b220ed47c1260 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)
python-ifupdown2 ================ This package is a replacement for the debian ifupdown package. It is ifupdown re-written in python. It maintains the original ifupdown pluggable architecture and extends it further. The python-ifupdown2 package provides the infrastructure for parsing /etc/network/interfaces file, loading, scheduling and state management of interfaces. It dynamically loads python modules from /usr/share/ifupdownmodules (provided by the python-ifupdown2-addons package). To remain compatible with other packages that depend on ifupdown, it also executes scripts under /etc/network/. To make the transition smoother, a python module under /usr/share/ifupdownmodules will override a script by the same name under /etc/network/. It publishes an interface object which is passed to all loadble python modules. For more details on adding a addon module, see the section on adding python modules. pluggable python modules: ========================= Unlike original ifupdown, all interface configuration is moved to external python modules. That includes inet, inet6 and dhcp configurations. A set of default modules are provided by the python-ifupdown2-addons deb. python-ifupdown2 expects a few things from the pluggable modules: - the module should implement a class by the same name - the interface object (class iface) and the operation to be performed is passed to the modules - the python addon class should provide a few methods: - run() : method to configure the interface. - get_ops() : must return a list of operations it supports. eg: 'pre-up', 'post-down' - get_dependent_ifacenames() : must return a list of interfaces the interface is dependent on. This is used to build the dependency list for sorting and executing interfaces in dependency order. - if the module supports -r option to ifquery, ie ability to construct the ifaceobj from running state, it can optionally implement the get_dependent_ifacenames_running() method, to return the list of dependent interfaces derived from running state of the interface. This is different from get_dependent_ifacenames() where the dependent interfaces are derived from the interfaces config file (provided by the user). Example: Address handling module /usr/share/ifupdownaddons/address.py build ===== - get source - install build dependencies: apt-get install python-stdeb apt-get install python-docutils - cd <python-ifupdown2 sourcedir> && ./build.sh (generates python-ifupdown2-<ver>.deb) install ======= - remove existing ifupdown package dpkg -r ifupdown - install python-ifupdown2 using `dpkg -i` - or install from deb dpkg -i python-ifupdown2-<ver>.deb - note that python-ifupdown2 requires python-ifupdown2-addons package to function. And python-ifupdown2-addons deb has an install dependency on python-ifupdown2
Description
Languages
Python
99.2%
Shell
0.6%
Makefile
0.2%