diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/network-manager.init | 2 | ||||
| -rw-r--r-- | debian/network-manager.preinst | 11 |
3 files changed, 13 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index fb2e95eb..fad86363 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.9.7.997-2) UNRELEASED; urgency=low + + * Move pid file to the new location in /var/run/NetworkManager. + + -- Michael Biebl <biebl@debian.org> Sat, 09 Feb 2013 17:49:45 +0100 + network-manager (0.9.7.997-1) experimental; urgency=low * New upstream release (0.9.8 beta2). diff --git a/debian/network-manager.init b/debian/network-manager.init index 18323a88..b21c40f0 100644 --- a/debian/network-manager.init +++ b/debian/network-manager.init @@ -18,7 +18,7 @@ NAME="NetworkManager" DAEMON=/usr/sbin/$NAME -PIDFILE=/var/run/$NAME.pid +PIDFILE=/var/run/$NAME/$NAME.pid SCRIPTNAME=/etc/init.d/network-manager 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 ;; |