diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/network-manager.dirs | 1 | ||||
| -rw-r--r-- | debian/network-manager.init | 10 |
3 files changed, 6 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 6ae1b8d8..45478743 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,10 @@ 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. + * debian/network-manager.dirs,init + - Do no longer install the /var/run/NetworkManager directory. + * debian/network-manager.init + - Store the NetworkManager pid file directly in /var/run. -- Michael Biebl <biebl@debian.org> Mon, 06 Apr 2009 10:13:04 +0200 diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs index 35ce9986..233c3b50 100644 --- a/debian/network-manager.dirs +++ b/debian/network-manager.dirs @@ -1,2 +1 @@ var/lib/NetworkManager -var/run/NetworkManager diff --git a/debian/network-manager.init b/debian/network-manager.init index 18797994..3fc396db 100644 --- a/debian/network-manager.init +++ b/debian/network-manager.init @@ -20,8 +20,7 @@ NAME="NetworkManager" DAEMON=/usr/sbin/$NAME -PIDDIR=/var/run/NetworkManager -PIDFILE=$PIDDIR/$NAME.pid +PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/network-manager USER=root @@ -37,13 +36,8 @@ test -f /etc/default/NetworkManager && . /etc/default/NetworkManager # Function that starts the daemon/service. # d_start() { - if [ ! -d $PIDDIR ]; then - mkdir -p $PIDDIR - chown $USER:$USER $PIDDIR - fi - start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE + --oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS } |