diff options
| author | Jeremy Bicha <jbicha@ubuntu.com> | 2017-06-14 16:17:09 -0400 |
|---|---|---|
| committer | Jeremy Bicha <jbicha@ubuntu.com> | 2017-11-12 17:04:35 -0500 |
| commit | c66b9dc2f5759107d7ad57efa6348939f1e3be6d (patch) | |
| tree | 7769a84cdc166d0ad32790e31a746be2da5d31fc /debian | |
| parent | 96d03404263efab37ea6f347fed1c72aef49ec80 (diff) | |
Don't restart NetworkManager on upgrade
but notify the user a reboot may be required after upgrade
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/network-manager.postinst | 11 | ||||
| -rwxr-xr-x | debian/rules | 4 |
2 files changed, 14 insertions, 1 deletions
diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index fbf4ed1a..e4fb2981 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -20,6 +20,17 @@ set -e case "$1" in configure) + # request a reboot (NM tears down interfaces on restart + # which is not the way we want to go) + [ -x /usr/share/update-notifier/notify-reboot-required ] && \ + /usr/share/update-notifier/notify-reboot-required + + update-rc.d -f NetworkManager remove >/dev/null + + if [ -x "/etc/init.d/dbus" ]; then + invoke-rc.d dbus force-reload || true + fi + NIF=/etc/network/interfaces if [ -z "$2" ] && [ -f $NIF ]; then ifaces=`grep -v '^#' $NIF | awk '/iface/ {print $2}' | sort -u | sed -e 's/lo//' -e '/^$/d' -e 's/^/- /'` diff --git a/debian/rules b/debian/rules index 9e369d0f..837a3ce9 100755 --- a/debian/rules +++ b/debian/rules @@ -80,7 +80,9 @@ override_dh_systemd_start: dh_link -pnetwork-manager \ lib/systemd/system/NetworkManager.service \ lib/systemd/system/network-manager.service - dh_systemd_start -pnetwork-manager --no-also NetworkManager.service + dh_systemd_start -pnetwork-manager --no-start NetworkManager-dispatcher.service + dh_systemd_start -pnetwork-manager --no-start NetworkManager-wait-online.service + dh_systemd_start -pnetwork-manager --restart-after-upgrade NetworkManager.service override_dh_ppp: dh_ppp --breaks |