about summary refs log tree commit diff
path: root/debian/network-manager.preinst
diff options
context:
space:
mode:
Diffstat (limited to 'debian/network-manager.preinst')
-rw-r--r--debian/network-manager.preinst5
1 files changed, 5 insertions, 0 deletions
diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst
index 0dddcb3a..9a18984e 100644
--- a/debian/network-manager.preinst
+++ b/debian/network-manager.preinst
@@ -58,6 +58,11 @@ case "$1" in
 	fi
 	if dpkg --compare-versions "$2" lt "0.7.0.100-1"; then
 	    rm_conffile network-manager /etc/udev/rules.d/77-nm-probe-modem-capabilities.rules
+	    # Move old pid file to /var/run, so /var/run/NetworkManager can be removed
+	    # cleanly on upgrades and the daemon can be stopped correctly in postinst
+	    if [ -f /var/run/NetworkManager/NetworkManager.pid ]; then
+	        mv /var/run/NetworkManager/NetworkManager.pid /var/run/
+	    fi
 	fi
 	;;