[Initng-svn] r2354 - in initng/initfiles: daemon system

[svn at initng.thinktux.net]

Author: danne
Date: Tue Dec  6 13:58:23 2005
New Revision: 2354

Modified:
   initng/initfiles/daemon/pump.ii
   initng/initfiles/daemon/udhcpc.ii
   initng/initfiles/daemon/wpa_supplicant.ii
   initng/initfiles/system/fbsplash.ii
Log:
Replaced all occurences /lib/initng with $INITNG_PLUGIN_DIR because
of changes in commit 2328.


Modified: initng/initfiles/daemon/pump.ii
==============================================================================
--- initng/initfiles/daemon/pump.ii	(original)
+++ initng/initfiles/daemon/pump.ii	Tue Dec  6 13:58:23 2005
@@ -23,8 +23,8 @@
 
 		[[ ${d} == *' nontp '* ]] && exit 0
 
-		. @/lib/initng@/scripts/net/functions
-		. @/lib/initng@/scripts/net/system
+		. $INITNG_PLUGIN_DIR/scripts/net/functions
+		. $INITNG_PLUGIN_DIR/scripts/net/system
 
 		eval ntp_servers_${ifvar}=$( pump -i ${iface} --status | sed -n -e 's/^.*Ntpservers: //p' )
 		system_ntp

Modified: initng/initfiles/daemon/udhcpc.ii
==============================================================================
--- initng/initfiles/daemon/udhcpc.ii	(original)
+++ initng/initfiles/daemon/udhcpc.ii	Tue Dec  6 13:58:23 2005
@@ -13,6 +13,6 @@
 		[[ -n ${h} && ${h} != "(none)" && ${h} != "localhost" \
 			&& ${opts} != *' -h '* && ${d} != *' nohostname '* ]] \
 				&& opts="${opts} --hostname=${h}"
-		exec udhcpc ${opts} --now --script=@/lib/initng@/scripts/net/udhcpc-wrapper --pidfile=/var/run/udhcpc-${NAME}.pid --interface=${NAME}
+		exec udhcpc ${opts} --now --script=$INITNG_PLUGIN_DIR/scripts/net/udhcpc-wrapper --pidfile=/var/run/udhcpc-${NAME}.pid --interface=${NAME}
 	}
 }

Modified: initng/initfiles/daemon/wpa_supplicant.ii
==============================================================================
--- initng/initfiles/daemon/wpa_supplicant.ii	(original)
+++ initng/initfiles/daemon/wpa_supplicant.ii	Tue Dec  6 13:58:23 2005
@@ -4,7 +4,7 @@
     
         script daemon  {
          
-                . /lib/initng/scripts/net/functions
+                . $INITNG_PLUGIN_DIR/scripts/net/functions
                 eval opts=\"\$\{wpa_supplicant_${ifvar}\} -i${iface} -c/etc/wpa_supplicant.conf -B\"
                 [[ -f /sbin/wpa_cli.action ]] \
                         && opts="${opts} -W -P/var/run/wpa_supplicant-${iface}.pid"

Modified: initng/initfiles/system/fbsplash.ii
==============================================================================
--- initng/initfiles/system/fbsplash.ii	(original)
+++ initng/initfiles/system/fbsplash.ii	Tue Dec  6 13:58:23 2005
@@ -1,15 +1,15 @@
 service system/fbsplash/start {
 	need = system/initial;
-	exec start = @/lib/initng@/scripts/splash/fbsplash.sh;
+	exec start = $INITNG_PLUGIN_DIR/scripts/splash/fbsplash.sh;
 	exec_args start = start;
-	exec stop = @/lib/initng@/scripts/splash/fbsplash.sh;
+	exec stop = $INITNG_PLUGIN_DIR/scripts/splash/fbsplash.sh;
 	exec_args stop = shutdown;
 }
 
 service system/fbsplash/stop {
 	need = system/initial;
 	just_before = daemon/gdm daemon/kdm daemon/xdm daemon/wdm daemon/entranced;
-	exec start = @/lib/initng@/scripts/splash/fbsplash.sh;
+	exec start = $INITNG_PLUGIN_DIR/scripts/splash/fbsplash.sh;
 	exec_args start = stop;
 }