From cbea5ba7696f81a8700961bb1b290910e383b566 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 18 Jun 2017 18:40:14 +0200 Subject: Install ifupdown dispatcher script via network-manager.install This avoids a FTBFS when doing arch:all builds. Rename the script to 01-ifupdown while at it for consistencies sake. Closes: #864980 --- debian/01-ifupdown | 82 ++++++++++++++++++++++++++++++++ debian/network-manager-dispatcher.script | 82 -------------------------------- debian/network-manager.install | 1 + debian/network-manager.maintscript | 1 + debian/rules | 2 - 5 files changed, 84 insertions(+), 84 deletions(-) create mode 100755 debian/01-ifupdown delete mode 100644 debian/network-manager-dispatcher.script diff --git a/debian/01-ifupdown b/debian/01-ifupdown new file mode 100755 index 00000000..5ac31f07 --- /dev/null +++ b/debian/01-ifupdown @@ -0,0 +1,82 @@ +#!/bin/sh -e +# Script to dispatch NetworkManager events +# +# Runs ifupdown scripts when NetworkManager fiddles with interfaces. +# See NetworkManager(8) for further documentation of the dispatcher events. + +# We do not handle connectivity-change events in ifupdown so simply exit at +# this point +if [ "$2" = "connectivity-change" ]; then + exit 0; +fi + +if [ -z "$1" ]; then + echo "$0: called with no interface" 1>&2 + exit 1; +fi + +if [ -n "$IP4_NUM_ADDRESSES" ] && [ "$IP4_NUM_ADDRESSES" -gt 0 ]; then + ADDRESS_FAMILIES="$ADDRESS_FAMILIES inet" +fi +if [ -n "$IP6_NUM_ADDRESSES" ] && [ "$IP6_NUM_ADDRESSES" -gt 0 ]; then + ADDRESS_FAMILIES="$ADDRESS_FAMILIES inet6" +fi + +# If we have a VPN connection ignore the underlying IP address(es) +if [ "$2" = "vpn-up" ] || [ "$2" = "vpn-down" ]; then + ADDRESS_FAMILIES="" +fi + +if [ -n "$VPN_IP4_NUM_ADDRESSES" ] && [ "$VPN_IP4_NUM_ADDRESSES" -gt 0 ]; then + ADDRESS_FAMILIES="$ADDRESS_FAMILIES inet" +fi +if [ -n "$VPN_IP6_NUM_ADDRESSES" ] && [ "$VPN_IP6_NUM_ADDRESSES" -gt 0 ]; then + ADDRESS_FAMILIES="$ADDRESS_FAMILIES inet6" +fi + +# We're probably bringing the interface down. +[ -n "$ADDRESS_FAMILIES" ] || ADDRESS_FAMILIES="inet" + +# Fake ifupdown environment +export IFACE="$1" +export LOGICAL="$1" +export METHOD="NetworkManager" +export VERBOSITY="0" + +for i in $ADDRESS_FAMILIES; do + + export ADDRFAM="$i" + + # Run the right scripts + case "$2" in + up|vpn-up) + export MODE="start" + export PHASE="post-up" + run-parts /etc/network/if-up.d + ;; + down|vpn-down) + export MODE="stop" + export PHASE="post-down" + run-parts /etc/network/if-post-down.d + ;; +# pre-up/pre-down not implemented. See +# https://bugzilla.gnome.org/show_bug.cgi?id=387832 +# pre-up) +# export MODE="start" +# export PHASE="pre-up" +# run-parts /etc/network/if-pre-up.d +# ;; +# pre-down) +# export MODE="stop" +# export PHASE="pre-down" +# run-parts /etc/network/if-down.d +# ;; + hostname|dhcp4-change|dhcp6-change) + # Do nothing + ;; + *) + echo "$0: called with unknown action \`$2'" 1>&2 + exit 1 + ;; + esac +done diff --git a/debian/network-manager-dispatcher.script b/debian/network-manager-dispatcher.script deleted file mode 100644 index 5ac31f07..00000000 --- a/debian/network-manager-dispatcher.script +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh -e -# Script to dispatch NetworkManager events -# -# Runs ifupdown scripts when NetworkManager fiddles with interfaces. -# See NetworkManager(8) for further documentation of the dispatcher events. - -# We do not handle connectivity-change events in ifupdown so simply exit at -# this point -if [ "$2" = "connectivity-change" ]; then - exit 0; -fi - -if [ -z "$1" ]; then - echo "$0: called with no interface" 1>&2 - exit 1; -fi - -if [ -n "$IP4_NUM_ADDRESSES" ] && [ "$IP4_NUM_ADDRESSES" -gt 0 ]; then - ADDRESS_FAMILIES="$ADDRESS_FAMILIES inet" -fi -if [ -n "$IP6_NUM_ADDRESSES" ] && [ "$IP6_NUM_ADDRESSES" -gt 0 ]; then - ADDRESS_FAMILIES="$ADDRESS_FAMILIES inet6" -fi - -# If we have a VPN connection ignore the underlying IP address(es) -if [ "$2" = "vpn-up" ] || [ "$2" = "vpn-down" ]; then - ADDRESS_FAMILIES="" -fi - -if [ -n "$VPN_IP4_NUM_ADDRESSES" ] && [ "$VPN_IP4_NUM_ADDRESSES" -gt 0 ]; then - ADDRESS_FAMILIES="$ADDRESS_FAMILIES inet" -fi -if [ -n "$VPN_IP6_NUM_ADDRESSES" ] && [ "$VPN_IP6_NUM_ADDRESSES" -gt 0 ]; then - ADDRESS_FAMILIES="$ADDRESS_FAMILIES inet6" -fi - -# We're probably bringing the interface down. -[ -n "$ADDRESS_FAMILIES" ] || ADDRESS_FAMILIES="inet" - -# Fake ifupdown environment -export IFACE="$1" -export LOGICAL="$1" -export METHOD="NetworkManager" -export VERBOSITY="0" - -for i in $ADDRESS_FAMILIES; do - - export ADDRFAM="$i" - - # Run the right scripts - case "$2" in - up|vpn-up) - export MODE="start" - export PHASE="post-up" - run-parts /etc/network/if-up.d - ;; - down|vpn-down) - export MODE="stop" - export PHASE="post-down" - run-parts /etc/network/if-post-down.d - ;; -# pre-up/pre-down not implemented. See -# https://bugzilla.gnome.org/show_bug.cgi?id=387832 -# pre-up) -# export MODE="start" -# export PHASE="pre-up" -# run-parts /etc/network/if-pre-up.d -# ;; -# pre-down) -# export MODE="stop" -# export PHASE="pre-down" -# run-parts /etc/network/if-down.d -# ;; - hostname|dhcp4-change|dhcp6-change) - # Do nothing - ;; - *) - echo "$0: called with unknown action \`$2'" 1>&2 - exit 1 - ;; - esac -done diff --git a/debian/network-manager.install b/debian/network-manager.install index ab8ab00d..224a10b6 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -26,3 +26,4 @@ lib/systemd/system/NetworkManager-wait-online.service debian/NetworkManager.conf etc/NetworkManager/ debian/org.freedesktop.NetworkManager.pkla var/lib/polkit-1/localauthority/10-vendor.d/ debian/60-network-manager.rules usr/share/polkit-1/rules.d/ +debian/01-ifupdown etc/NetworkManager/dispatcher.d/ diff --git a/debian/network-manager.maintscript b/debian/network-manager.maintscript index d588ec75..c6b7a809 100644 --- a/debian/network-manager.maintscript +++ b/debian/network-manager.maintscript @@ -1 +1,2 @@ rm_conffile /etc/dbus-1/system.d/nm-avahi-autoipd.conf 1.1.90-2~ +mv_conffile /etc/NetworkManager/dispatcher.d/01ifupdown /etc/NetworkManager/dispatcher.d/01-ifupdown 1.8.0-5~ diff --git a/debian/rules b/debian/rules index c912aacf..611c3327 100755 --- a/debian/rules +++ b/debian/rules @@ -53,8 +53,6 @@ override_dh_auto_configure: override_dh_install: dh_install -X.la --list-missing - install -m 755 debian/network-manager-dispatcher.script \ - debian/network-manager/etc/NetworkManager/dispatcher.d/01ifupdown override_dh_makeshlibs: dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/NetworkManager/ -X/usr/lib/pppd/ -- cgit 1.3.0-6-gf8a5