[Initng-svn] r4337 - initng-ifiles/trunk/initfiles/daemon

[svn at initng.thinktux.net]

Author: biebl
Date: Fri Jun  2 05:19:30 2006
New Revision: 4337

Modified:
   initng-ifiles/trunk/initfiles/daemon/NetworkManager.ii
   initng-ifiles/trunk/initfiles/daemon/NetworkManagerDispatcher.ii

Log:
- Set a fixed pid-file for NetworkManager and NetworkManagerDispatcher via their coammandline switch --pid-file. This fixes the problem of different default locations of the pid-files (e.g. Debian vs. Ubuntu)
- Put the pid-files in /var/run/NetworkManager, if necessary create this directory in NetworkManager/prepare


Modified: initng-ifiles/trunk/initfiles/daemon/NetworkManager.ii
==============================================================================
--- initng-ifiles/trunk/initfiles/daemon/NetworkManager.ii	(original)
+++ initng-ifiles/trunk/initfiles/daemon/NetworkManager.ii	Fri Jun  2 05:19:30 2006
@@ -1,14 +1,17 @@
 service daemon/NetworkManager/prepare {
 	need = system/bootmisc;
 	script start = {
-		[ -d /var/lib/NetworkManager ] || /bin/mkdir -p /var/lib/NetworkManager
+		[ -d /var/lib/NetworkManager ] || @/bin/mkdir@ -p /var/lib/NetworkManager
 		chmod 755 /var/lib/NetworkManager
+		[ -d /var/run/NetworkManager ] || @/bin/mkdir@ -p /var/run/NetworkManager
+		chmod 755 /var/run/NetworkManager
 	};
 }
 
 daemon daemon/NetworkManager {
 	need = system/bootmisc daemon/dbus daemon/NetworkManager/prepare system/modules/capability daemon/hald daemon/dhcdbd;
-	exec daemon  = @/usr/sbin/NetworkManager@;
-	pid_file = /var/run/NetworkManager.pid;
+	env PID_FILE = /var/run/NetworkManager/NetworkManager.pid;
+	exec daemon  = @/usr/sbin/NetworkManager@ --pid-file=${PID_FILE};
+	pid_file = ${PID_FILE};
 	forks;
 }

Modified: initng-ifiles/trunk/initfiles/daemon/NetworkManagerDispatcher.ii
==============================================================================
--- initng-ifiles/trunk/initfiles/daemon/NetworkManagerDispatcher.ii	(original)
+++ initng-ifiles/trunk/initfiles/daemon/NetworkManagerDispatcher.ii	Fri Jun  2 05:19:30 2006
@@ -1,6 +1,7 @@
 daemon daemon/NetworkManagerDispatcher {
 	need = system/bootmisc daemon/dbus daemon/NetworkManager;
-	exec daemon = @/usr/sbin/NetworkManagerDispatcher@;
-	pid_file = /var/run/NetworkManagerDispatcher.pid;
+	env PID_FILE = /var/run/NetworkManager/NetworkManagerDispatcher.pid;
+	exec daemon = @/usr/sbin/NetworkManagerDispatcher@ --pid-file=${PID_FILE};
+	pid_file = ${PID_FILE};
 	forks;
 }