--- mcore-src/trunk/mcore-tools/src/modules/network/network.client.class.in	2014/01/14 10:34:57	2269
+++ mcore-src/trunk/mcore-tools/src/modules/network/network.client.class.in	2015/12/04 11:01:02	2667
@@ -1,7 +1,7 @@
 # $Id$
 
 provide basic-networking
-require basic-system
+require basic-system basic-init
 
 help_network_hostname()
 {
@@ -56,7 +56,7 @@
 	addconfig "ff02::3 ip6-allhosts"
 
 	# check for running x11 and recreate the xauth cookie with the correct hostname
-	if [[ ! -z $(pidof X) ]]
+	if [[ ! -z $(pidof X) ]]  || [[ -n $(pidof Xorg) ]]
 	then
 		socket="${value}/unix${MCORE_XORG_DISPLAY}"
 		cookie=$(x11runas "xauth list | sed 's:.*\ \(.*\):\1:'")
@@ -140,9 +140,9 @@
 	then
 		if [[ ! -z $(ip addr | grep "${iface}.*UP.*") ]]
 		then
-			set_system_service restart network "${iface}"
+			${MCORE_LIBDIR}/mcore-system-service --restart --service network "${iface}"
 		else
-			set_system_service start network "${iface}"
+			${MCORE_LIBDIR}/mcore-system-service --start --service network "${iface}"
 		fi
 	else
 		case ${networking} in