From 3ada820bcaa98d84d88b991e3e2179ca13bdfd8d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 8 Apr 2009 05:01:55 +0000 Subject: 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. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3039 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/network-manager.preinst | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2ef7c1c5..5ca47847 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ network-manager (0.7.0.100-1) UNRELEASED; urgency=low * 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 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 ;; -- cgit 1.3.0-6-gf8a5