Diff of /alx-src/branches/alxconf-060/functions/config_network.sh

Parent Directory | Revision Log | Patch

	revision 2001 by niro, Mon May 9 14:51:55 2011 UTC	revision 2016 by niro, Mon May 9 16:13:58 2011 UTC
#	Line 102  config_networking()	Line 102  config_networking()
102
103	case ${ALX_NETWORKING} in	case ${ALX_NETWORKING} in
104	dhcp|DHCP)	dhcp|DHCP)
105	echo 'DHCP_PROG="/sbin/dhcpcd"' >> /etc/conf.d/net.${iface}	echo 'DHCP_PROG="/sbin/udhcpc"' >> /etc/conf.d/net.${iface}
106	# -k kills the dhcp-cache at system shutdown	# -k kills the dhcp-cache at system shutdown
107	# -z will not	# -z will not
108	echo 'DHCP_STOP="-z"' >> /etc/conf.d/net.${iface}	echo 'DHCP_STOP=""' >> /etc/conf.d/net.${iface}
109	#timeout after 10 seconds	#timeout after 10 seconds
110	echo 'DHCP_START="-t 10"' >> /etc/conf.d/net.${iface}	echo 'DHCP_START="-t 10"' >> /etc/conf.d/net.${iface}
111	;;	;;
#	Line 138  config_networking()	Line 138  config_networking()
138	echo "nameserver ${ALX_DNS}" > /etc/resolv.conf	echo "nameserver ${ALX_DNS}" > /etc/resolv.conf
139	fi	fi
140
	# setup smb.conf (little sed magic:)
	# first get smb version !
	local smbconf
	[[ $(smbd --version | cut -d' ' -f2) > 2.999 ]] && smbconf=smb3.conf || smbconf=smb.conf
	cat ${ALX_SKELETONS}/samba/${smbconf} > /etc/samba/smb.conf
	sed -i -e "s:\(workgroup = \).*:\1${ALX_DOMAIN}:" /etc/samba/smb.conf
141	# wireless extensions	# wireless extensions
142	local value	local value
143	local var	local var

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.2001   changed lines   Added in v.2016