proxmox-mirrors/mirror_ifupdown2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ifupdown2 synced 2025-08-16 22:22:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

debian: postinst: remove diversion after upgrade from stretch

Browse Source 
closes: #919443

Reported-by: Andreas Beckmann <anbe@debian.org>
Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin 2019-01-16 17:19:45 +08:00
parent 9f98f3604e
commit 0aa3d31930
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
ifupdown2 (1.2.5-1) unstable; urgency=medium
* Fix: debian: postinst: remove diversion after upgrade from stretch
(closes: #919443)
-- Julien Fortin <julien@cumulusnetworks.com> Wed, 16 Jan 2019 23:42:42 +0800
ifupdown2 (1.2.4-1) unstable; urgency=medium ifupdown2 (1.2.4-1) unstable; urgency=medium
* Fix: statemanager directory path customization via ifupdown2.conf * Fix: statemanager directory path customization via ifupdown2.conf

23
debian/ifupdown2.postinst vendored
View File

@ -63,12 +63,35 @@ process_udev()
fi fi
} }
# restore file if we diverted it on install/upgrade
_postinst_remove_diverts()
{
diversions=$(LC_ALL=C.UTF-8 dpkg-divert --list | grep "^diversion of $1 .* by ifupdown2$" | wc -l 2> /dev/null)
if [ $diversions -gt 0 ];
then
dpkg-divert --remove --package ifupdown2 --rename $1
fi
}
postinst_remove_diverts()
{
for filename in ifup ifdown ifquery ifreload
do
_postinst_remove_diverts "/sbin/$filename"
_postinst_remove_diverts "/usr/share/bash-completion/completions/$filename"
_postinst_remove_diverts "/etc/bash_completion.d/$filename"
_postinst_remove_diverts "/usr/share/man/man8/$filename.8.gz"
done
_postinst_remove_diverts "/usr/share/man/man5/interfaces.5.gz"
}
case "$1" in case "$1" in
configure) configure)
fix_dhclient_file_with_space fix_dhclient_file_with_space
process_etc_network_interfaces process_etc_network_interfaces
process_udev process_udev
chmod +x /usr/share/ifupdown2/__main__.py chmod +x /usr/share/ifupdown2/__main__.py
postinst_remove_diverts
;; ;;
abort-upgrade|abort-remove|abort-deconfigure) abort-upgrade|abort-remove|abort-deconfigure)