about summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/network-manager.postinst11
-rwxr-xr-xdebian/rules4
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