/[mcore-svn]/mcore-src/trunk/mcore-tools/src/modules/network/network.client.class.in

Diff of /mcore-src/trunk/mcore-tools/src/modules/network/network.client.class.in

Parent Directory | Revision Log | View Patch Patch

-mcore-src/trunk/mcore-tools/daemon/client/include/network.client.class
revision 1896 by niro,
Fri Nov  4 08:24:27 2011 UTC
+mcore-src/trunk/mcore-tools/src/modules/network/network.client.class.in
revision 2668 by niro,
Fri Dec  4 11:03:31 2015 UTC
 Line 1
  # $Id$
  provide basic-networking
- require basic-system
+ require basic-system basic-init
  help_network_hostname()
  {
  	mecho "get network.hostname"
- 	mecho " displays the current hostname"
+ 	mecho " Displays the current hostname"
  	mecho
  	mecho "set network.hostname [hostname]"
  	mecho " Sets the hostname of the system"
 Line 15 
 help_network_hostname()
  get_network_hostname()
  {
- 	hostname
+ 	local val
+ 	if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
+ 	then
+ 		val=$(hostname)
+ 	else
+ 		val=$(< @@SYSCONFDIR@@/hostname)
+ 	fi
+ 	rvecho "${val}"
  }
  # set_network_hostname $value
  set_network_hostname()
  {
- 	local value="$1"
+ 	local value="${CLASS_ARGV[0]}"
  	local CONFIG
  	local socket
  	local cookie
-Line 29 
 set_network_hostname()
+Line 38 
 set_network_hostname()
  	[[ -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
-Line 47 
 set_network_hostname()
+Line 56 
 set_network_hostname()
  	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:'")
-Line 59 
 set_network_hostname()
+Line 68 
 set_network_hostname()
  help_network_iface()
  {
+ 	mecho "get network.iface"
+ 	mecho " Lists all configured network interfaces"
+ 	mecho
  	mecho "set network.iface [iface] [networking] [ip] [netmask] [broadcast] [network]"
+ 	mecho " Configure network interfaces"
  	mecho "  iface - the interface name"
  	mecho "  networking - may be 'static' or 'dhcp'"
  	mecho "  ip, netmask, broadcast and network are optional and only required on static networking"
  }
+ get_network_iface()
+ {
+ 	local iface
+ 	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}@@CONFDDIR@@${iface}; echo ) | while read line
+ 		do
+ 			rvecho -n ";${line}"
+ 		done
+ 		rvecho
+ 	done
+ }
  set_network_iface()
  {
- 	local iface="$1"
+ 	local iface="${CLASS_ARGV[0]}"
- 	local networking="$2"
+ 	local networking="${CLASS_ARGV[1]}"
- 	local ip="$3"
+ 	local ip="${CLASS_ARGV[2]}"
- 	local netmask="$4"
+ 	local netmask="${CLASS_ARGV[3]}"
- 	local broadcast="$5"
+ 	local broadcast="${CLASS_ARGV[4]}"
- 	local network="$6"
+ 	local network="${CLASS_ARGV[5]}"
  	local CONFIG
+ 	local dhcp_prog
  	[[ -z ${iface} ]] && help_network_iface && return 1
  	[[ -z ${networking} ]] && help_network_iface && return 1
-Line 86 
 set_network_iface()
+Line 118 
 set_network_iface()
  		[[ -z ${network} ]] && help_network_iface && return 1
  	fi
- 	CONFIG="/etc/conf.d/net.${iface}"
+ 	if is_provided systemd
+ 	then
+ 		decho "set_network_iface() is not supported with systemd, only sysvinit atm"
+ 		return 0
+ 	fi
+ 	CONFIG="@@CONFDDIR@@/net.${iface}"
  	clearconfig
  	addconfig 'ONBOOT="yes"'
-Line 104 
 set_network_iface()
+Line 142 
 set_network_iface()
  			;;
  	esac
- 	if [[ ! -z $(ip addr | grep "${iface}.*UP.*") ]]
+ 	if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
  	then
- 		set_system_service restart network "${iface}"
+ 		if [[ ! -z $(ip addr | grep "${iface}.*UP.*") ]]
+ 		then
+ 			${MCORE_LIBDIR}/mcore-system-service --restart --service network "${iface}"
+ 		else
+ 			${MCORE_LIBDIR}/mcore-system-service --start --service network "${iface}"
+ 		fi
  	else
- 		set_system_service start network "${iface}"
+ 		case ${networking} in
+ 			static)
+ 				ifconfig "${iface}" "${ip}" netmask "${netmask}" broadcast "${broadcast}"
+ 				;;
+ 			dhcp)
+ 					source @@CONFDDIR@@/network
+ 					[[ ! -z $(pidof ${dhcp_prog}) ]] && killall ${DEFAULT_DHCP_PROG}
+ 					${DEFAULT_DHCP_PROG} ${DEFAULT_DHCP_START} "${iface}"
+ 					;;
+ 		esac
  	fi
  }
-Line 130 
 get_network_gateway()
+Line 182 
 get_network_gateway()
  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}"
-Line 162 
 get_network_nameserver()
+Line 214 
 get_network_nameserver()
  	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}"
-Line 171 
 get_network_nameserver()
+Line 223 
 get_network_nameserver()
  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

 Legend:



Removed from v.1896
 


changed lines


 
Added in v.2668
 Legend:



Removed from v.1896
 


changed lines


 
Added in v.2668
-Removed from v.1896
+Added in v.2668