about summary refs log tree commit diff
path: root/debian/network-manager.init
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2009-04-08 04:24:45 +0000
committerMichael Biebl <biebl@debian.org>2009-04-08 04:24:45 +0000
commit26b28e491ae69bd4e0727b28cbd84e7efa98f328 (patch)
tree66f8b0b5b22f600ebf194d9a793f1e6a7e2f4895 /debian/network-manager.init
parentb3413934a91f67a78dee334adb9886e5bc2fe86c (diff)
* 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.

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3037 ceb527fc-18e6-0310-9fe2-813c157c29e7
Diffstat (limited to 'debian/network-manager.init')
-rw-r--r--debian/network-manager.init10
1 files changed, 2 insertions, 8 deletions
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
 		
 }