about summary refs log tree commit diff
path: root/debian/network-manager.preinst
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2013-02-09 17:50:11 +0100
committerMichael Biebl <biebl@debian.org>2013-02-09 19:20:54 +0100
commit00f11f12ad03c3aa4aa79c35805ad634ff192458 (patch)
tree9c4f5923d5353dbe509da56d512904fc3f3efb97 /debian/network-manager.preinst
parent04ec6216c44ea6288cced308fbda0a177e6ea577 (diff)
Move pid file to the new location in /var/run/NetworkManager.
Diffstat (limited to 'debian/network-manager.preinst')
-rw-r--r--debian/network-manager.preinst11
1 files changed, 6 insertions, 5 deletions
diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst
index 985b65ad..2cd96f22 100644
--- a/debian/network-manager.preinst
+++ b/debian/network-manager.preinst
@@ -26,11 +26,12 @@ case "$1" in
 	    fi
 	    update-rc.d network-manager-dispatcher remove >/dev/null
 	fi
-	if dpkg --compare-versions "$2" lt "0.7.0.100-1"; then
-	    # 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/
+	if dpkg --compare-versions "$2" lt "0.9.7.997-2"; then
+	    # Move old pid file to /var/run/NetworkManager so the init script
+	    # doesn't get confused
+	    if [ -f /var/run/NetworkManager.pid ]; then
+	        [ -d /var/run/NetworkManager/ ] || mkdir /var/run/NetworkManager
+	        mv -n /var/run/NetworkManager.pid /var/run/NetworkManager/
 	    fi
 	fi
 	;;