--- mcore-src/trunk/mcore-tools/daemon/client/include/network.client.class	2013/05/10 10:45:38	2076
+++ mcore-src/trunk/mcore-tools/src/modules/network/network.client.class.in	2014/01/14 10:34:57	2269
@@ -21,7 +21,7 @@
 	then
 		val=$(hostname)
 	else
-		val=$(< /etc/hostname)
+		val=$(< @@SYSCONFDIR@@/hostname)
 	fi
 
 	rvecho "${val}"
@@ -30,7 +30,7 @@
 # set_network_hostname $value
 set_network_hostname()
 {
-	local value="$1"
+	local value="${CLASS_ARGV[0]}"
 	local CONFIG
 	local socket
 	local cookie
@@ -38,13 +38,13 @@
 
 	[[ -z ${value} ]] && help_network_hostname && return 1
 
-	CONFIG="/etc/hostname"
+	CONFIG="@@SYSCONFDIR@@/hostname"
 	clearconfig
 	addconfig "${value}"
 	hostname "${value}"
 
 	# update hosts file
-	CONFIG="/etc/hosts"
+	CONFIG="@@SYSCONFDIR@@/hosts"
 	clearconfig
 	addconfig "127.0.0.1 localhost ${value}"
 	# add ipv6 defaults
@@ -81,14 +81,14 @@
 get_network_iface()
 {
 	local iface
-	for iface in $(find ${MROOT}/etc/conf.d -maxdepth 1 -name 'net.*' -printf '%f\n')
+	for iface in $(find ${MROOT}@@CONFDDIR@@ -maxdepth 1 -name 'net.*' -printf '%f\n')
 	do
 		case ${iface} in
 			# exclude routes and samples
 			net.sample|net.routes) continue ;;
 		esac
 		rvecho -n "${iface//net.}"
-		( cat ${MROOT}/etc/conf.d/${iface}; echo ) | while read line
+		( cat ${MROOT}@@CONFDDIR@@${iface}; echo ) | while read line
 		do
 			rvecho -n ";${line}"
 		done
@@ -98,12 +98,12 @@
 
 set_network_iface()
 {
-	local iface="$1"
-	local networking="$2"
-	local ip="$3"
-	local netmask="$4"
-	local broadcast="$5"
-	local network="$6"
+	local iface="${CLASS_ARGV[0]}"
+	local networking="${CLASS_ARGV[1]}"
+	local ip="${CLASS_ARGV[2]}"
+	local netmask="${CLASS_ARGV[3]}"
+	local broadcast="${CLASS_ARGV[4]}"
+	local network="${CLASS_ARGV[5]}"
 	local CONFIG
 	local dhcp_prog
 
@@ -118,7 +118,7 @@
 		[[ -z ${network} ]] && help_network_iface && return 1
 	fi
 
-	CONFIG="/etc/conf.d/net.${iface}"
+	CONFIG="@@CONFDDIR@@/net.${iface}"
 	clearconfig
 	addconfig 'ONBOOT="yes"'
 
@@ -150,7 +150,7 @@
 				ifconfig "${iface}" "${ip}" netmask "${netmask}" broadcast "${broadcast}"
 				;;
 			dhcp)
-					source /etc/conf.d/network
+					source @@CONFDDIR@@/network
 					[[ ! -z $(pidof ${dhcp_prog}) ]] && killall ${DEFAULT_DHCP_PROG}
 					${DEFAULT_DHCP_PROG} ${DEFAULT_DHCP_START} "${iface}"
 					;;
@@ -176,13 +176,13 @@
 
 set_network_gateway()
 {
-	local value="$1"
+	local value="${CLASS_ARGV[0]}"
 	local CONFIG
 	local i
 
 	[[ -z ${value} ]] && help_network_gateway && return 1
 
-	CONFIG="/etc/conf.d/net.routes"
+	CONFIG="@@CONFDDIR@@/net.routes"
 	clearconfig
 	addconfig "default gw ${value}"
 
@@ -208,7 +208,7 @@
 	local dns
 	local i
 
-	dns=$(grep nameserver /etc/resolv.conf | sed 's:.*[[:space:]]\(.*\):\1:g')
+	dns=$(grep nameserver @@SYSCONFDIR@@/resolv.conf | sed 's:.*[[:space:]]\(.*\):\1:g')
 	for i in ${dns}
 	do
 		rvecho "${i}"
@@ -217,13 +217,13 @@
 
 set_network_nameserver()
 {
-	local values="$@"
+	local values="${CLASS_ARGV[*]}"
 	local CONFIG
 	local i
 
 	[[ -z ${values} ]] && help_network_nameserver && return 1
 
-	CONFIG="/etc/resolv.conf"
+	CONFIG="@@SYSCONFDIR@@/resolv.conf"
 	clearconfig
 	for i in ${values}
 	do