mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code

move udev script processing to before restarting networking

Browse Source 
Ticket: CM-5764
Reviewed By: jtoppins
Testing Done:
This commit is contained in:
Roopa Prabhu
2015-05-07 16:13:52 -07:00
parent 48db65f6e9
commit 458b49fa1e
2 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
debian/python-ifupdown2.postinst vendored
View File

@ -17,6 +17,24 @@ set -e
# for details, see http://www.debian.org/doc/debian-policy/ or # for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package # the debian-policy package
process_udev()
{
# override default udev bridge and hotplug rules because they interfere with
# networking init script
udev_user_rulesdir=/etc/udev/rules.d/
udev_sys_rulesdir=/lib/udev/rules.d/
if [ -e $udev_user_rulesdir ]; then
udev_ifupdown2_overrides="80-networking.rules
60-bridge-network-interface.rules"
for u in ${udev_ifupdown2_overrides}
do
if [ -e ${udev_sys_rulesdir}/$u -a ! -e ${udev_user_rulesdir}/$u ]; then
(cd ${udev_user_rulesdir} && ln -sf /dev/null $u)
fi
done
fi
}
MYNAME="${0##*/}" MYNAME="${0##*/}"
report() { echo "${MYNAME}: $*" ; } report() { echo "${MYNAME}: $*" ; }
@ -75,6 +93,7 @@ case "$1" in
(cd /usr/share/man/man8/ && ln -sf /usr/share/man/man8/ifup.8.gz ifdown.8.gz) (cd /usr/share/man/man8/ && ln -sf /usr/share/man/man8/ifup.8.gz ifdown.8.gz)
mkdir -p /etc/network/interfaces.d/ mkdir -p /etc/network/interfaces.d/
process_udev
update-rc.d networking start 40 S . start 35 0 6 . >/dev/null update-rc.d networking start 40 S . start 35 0 6 . >/dev/null
;; ;;
@ -90,21 +109,6 @@ esac
# dh_installdeb will replace this with shell code automatically # dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts. # generated by other debhelper scripts.
# override default udev bridge and hotplug rules because they interfere with
# networking init script
udev_user_rulesdir=/etc/udev/rules.d/
udev_sys_rulesdir=/lib/udev/rules.d/
if [ -e $udev_user_rulesdir ]; then
udev_ifupdown2_overrides="80-networking.rules
60-bridge-network-interface.rules"
for u in ${udev_ifupdown2_overrides}
do
if [ -e ${udev_sys_rulesdir}/$u -a ! -e ${udev_user_rulesdir}/$u ]; then
(cd ${udev_user_rulesdir} && ln -sf /dev/null $u)
fi
done
fi
#DEBHELPER# #DEBHELPER#
exit 0 exit 0

14
debian/python-ifupdown2.postrm vendored
View File

@ -18,9 +18,18 @@ set -e
# for details, see http://www.debian.org/doc/debian-policy/ or # for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package # the debian-policy package
process_udev()
{
udevlink=$(readlink /etc/udev/rules.d/80-networking.rules 2>/dev/null || true)
[ -n "$udevlink" -a "$udevlink" == "/dev/null" ] && rm -f /etc/udev/rules.d/80-networking.rules
udevlink=$(readlink /etc/udev/rules.d/60-bridge-network-interface.rules 2>/dev/null || true)
[ -n "$udevlink" -a "$udevlink" == "/dev/null" ] && rm -f /etc/udev/rules.d/60-bridge-network-interface.rules
}
postrm_remove() postrm_remove()
{ {
rm -f /sbin/ifup /sbin/ifdown /sbin/ifquery rm -f /sbin/ifup /sbin/ifdown /sbin/ifquery
process_udev
update-rc.d networking remove >/dev/null update-rc.d networking remove >/dev/null
} }
@ -54,11 +63,6 @@ case "$1" in
;; ;;
esac esac
udevlink=$(readlink /etc/udev/rules.d/80-networking.rules 2>/dev/null || true)
[ -n "$udevlink" -a "$udevlink" == "/dev/null" ] && rm -f /etc/udev/rules.d/80-networking.rules
udevlink=$(readlink /etc/udev/rules.d/60-bridge-network-interface.rules 2>/dev/null || true)
[ -n "$udevlink" -a "$udevlink" == "/dev/null" ] && rm -f /etc/udev/rules.d/60-bridge-network-interface.rules
# dh_installdeb will replace this with shell code automatically # dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts. # generated by other debhelper scripts.