[Pkg-utopia-commits] r3037 - in /packages/unstable/networkmanager/debian: changelog network-manager.dirs network-manager.init

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Apr  8 04:24:45 2009
New Revision: 3037

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3037
Log:
* 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.

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

Modified: packages/unstable/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/changelog?rev=3037&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/changelog (original)
+++ packages/unstable/networkmanager/debian/changelog Wed Apr  8 04:24:45 2009
@@ -6,6 +6,10 @@
   * 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 at debian.org>  Mon, 06 Apr 2009 10:13:04 +0200
 

Modified: packages/unstable/networkmanager/debian/network-manager.dirs
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/network-manager.dirs?rev=3037&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/network-manager.dirs (original)
+++ packages/unstable/networkmanager/debian/network-manager.dirs Wed Apr  8 04:24:45 2009
@@ -1,2 +1,1 @@
 var/lib/NetworkManager
-var/run/NetworkManager

Modified: packages/unstable/networkmanager/debian/network-manager.init
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/network-manager.init?rev=3037&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/network-manager.init (original)
+++ packages/unstable/networkmanager/debian/network-manager.init Wed Apr  8 04:24:45 2009
@@ -20,8 +20,7 @@
 
 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 @@
 #	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
 		
 }