[Pkg-utopia-commits] r3039 - in /packages/unstable/networkmanager/debian: changelog network-manager.preinst

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Apr  8 05:01:55 2009
New Revision: 3039

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3039
Log:
Move the old pid file from /var/run/NetworkManager to /var/run on
upgrades so the daemon can be stopped correctly in postinst and the
obsolete run directory is removed automatically.

Modified:
    packages/unstable/networkmanager/debian/changelog
    packages/unstable/networkmanager/debian/network-manager.preinst

Modified: packages/unstable/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/changelog?rev=3039&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/changelog (original)
+++ packages/unstable/networkmanager/debian/changelog Wed Apr  8 05:01:55 2009
@@ -6,6 +6,9 @@
   * debian/network-manager.preinst
     - Remove obsolete conffile
       /etc/udev/rules.d/77-nm-probe-modem-capabilities.rules.
+    - Move the old pid file from /var/run/NetworkManager to /var/run on
+      upgrades so the daemon can be stopped correctly in postinst and the
+      obsolete run directory is removed automatically.
   * debian/network-manager.dirs,init
     - Do no longer install the /var/run/NetworkManager directory.
   * debian/network-manager.init

Modified: packages/unstable/networkmanager/debian/network-manager.preinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/network-manager.preinst?rev=3039&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/network-manager.preinst (original)
+++ packages/unstable/networkmanager/debian/network-manager.preinst Wed Apr  8 05:01:55 2009
@@ -58,6 +58,11 @@
 	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
 	;;