mirror of https://github.com/OpenIPC/firmware.git
				
				
				
			Update Xm510/XM530 kernel configs, enable httpd, fix udhcp script
							parent
							
								
									52bf40c019
								
							
						
					
					
						commit
						287682a0a1
					
				|  | @ -37,10 +37,10 @@ CONFIG_LOCALVERSION="" | |||
| CONFIG_HAVE_KERNEL_GZIP=y | ||||
| CONFIG_HAVE_KERNEL_LZMA=y | ||||
| CONFIG_HAVE_KERNEL_LZO=y | ||||
| # CONFIG_KERNEL_GZIP is not set | ||||
| # CONFIG_KERNEL_LZMA is not set | ||||
| CONFIG_KERNEL_GZIP=y | ||||
| CONFIG_KERNEL_LZMA=y | ||||
| CONFIG_KERNEL_LZO=y | ||||
| CONFIG_DEFAULT_HOSTNAME="(none)" | ||||
| CONFIG_DEFAULT_HOSTNAME="openipc" | ||||
| # CONFIG_SWAP is not set | ||||
| CONFIG_SYSVIPC=y | ||||
| CONFIG_SYSVIPC_SYSCTL=y | ||||
|  |  | |||
|  | @ -38,7 +38,7 @@ CONFIG_HAVE_KERNEL_LZO=y | |||
| # CONFIG_KERNEL_LZMA is not set | ||||
| CONFIG_KERNEL_XZ=y | ||||
| # CONFIG_KERNEL_LZO is not set | ||||
| CONFIG_DEFAULT_HOSTNAME="(none)" | ||||
| CONFIG_DEFAULT_HOSTNAME="openipc" | ||||
| # CONFIG_SWAP is not set | ||||
| CONFIG_SYSVIPC=y | ||||
| CONFIG_SYSVIPC_SYSCTL=y | ||||
|  |  | |||
|  | @ -0,0 +1,105 @@ | |||
| #!/bin/sh | ||||
| 
 | ||||
| # udhcpc script edited by Tim Riker <Tim@Rikers.org> | ||||
| 
 | ||||
| [ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 | ||||
| 
 | ||||
| RESOLV_CONF="/etc/resolv.conf" | ||||
| [ -e $RESOLV_CONF ] || touch $RESOLV_CONF | ||||
| [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" | ||||
| [ -n "$subnet" ] && NETMASK="netmask $subnet" | ||||
| # Handle stateful DHCPv6 like DHCPv4 | ||||
| [ -n "$ipv6" ] && ip="$ipv6/128" | ||||
| 
 | ||||
| if [ -z "${IF_WAIT_DELAY}" ]; then | ||||
| 	IF_WAIT_DELAY=10 | ||||
| fi | ||||
| 
 | ||||
| wait_for_ipv6_default_route() { | ||||
| 	printf "Waiting for IPv6 default route to appear" | ||||
| 	while [ $IF_WAIT_DELAY -gt 0 ]; do | ||||
| 		if ip -6 route list | grep -q default; then | ||||
| 			printf "\n" | ||||
| 			return | ||||
| 		fi | ||||
| 		sleep 1 | ||||
| 		printf "." | ||||
| 		: $((IF_WAIT_DELAY -= 1)) | ||||
| 	done | ||||
| 	printf " timeout!\n" | ||||
| } | ||||
| 
 | ||||
| case "$1" in | ||||
| 	deconfig) | ||||
| 		/sbin/ifconfig $interface up | ||||
| 		/sbin/ifconfig $interface 0.0.0.0 | ||||
| 
 | ||||
| 		# drop info from this interface | ||||
| 		# resolv.conf may be a symlink to /tmp/, so take care | ||||
| 		TMPFILE=$(mktemp) | ||||
| 		grep -vE "# $interface\$" $RESOLV_CONF > $TMPFILE | ||||
| 		cat $TMPFILE > $RESOLV_CONF | ||||
| 		rm -f $TMPFILE | ||||
| 
 | ||||
| 		if [ -x /usr/sbin/avahi-autoipd ]; then | ||||
| 			/usr/sbin/avahi-autoipd -c $interface && /usr/sbin/avahi-autoipd -k $interface | ||||
| 		fi | ||||
| 		;; | ||||
| 
 | ||||
| 	leasefail|nak) | ||||
| 		if [ -x /usr/sbin/avahi-autoipd ]; then | ||||
| 			/usr/sbin/avahi-autoipd -c $interface || /usr/sbin/avahi-autoipd -wD $interface --no-chroot | ||||
| 		fi | ||||
| 		;; | ||||
| 
 | ||||
| 	renew|bound) | ||||
| 		if [ -x /usr/sbin/avahi-autoipd ]; then | ||||
| 			/usr/sbin/avahi-autoipd -c $interface && /usr/sbin/avahi-autoipd -k $interface | ||||
| 		fi | ||||
| 		/sbin/ifconfig $interface $ip $BROADCAST $NETMASK | ||||
| 		if [ -n "$ipv6" ] ; then | ||||
| 			wait_for_ipv6_default_route | ||||
| 		fi | ||||
| 
 | ||||
| 		if [ -n "$router" ] ; then | ||||
| 			echo "deleting routers" | ||||
| 			while route del default gw 0.0.0.0 dev $interface 2> /dev/null; do | ||||
| 				: | ||||
| 			done | ||||
| 
 | ||||
| 			for i in $router ; do | ||||
| 				route add default gw $i dev $interface | ||||
| 			done | ||||
| 		fi | ||||
| 
 | ||||
| 		# drop info from this interface | ||||
| 		# resolv.conf may be a symlink to /tmp/, so take care | ||||
| 		TMPFILE=$(mktemp) | ||||
| 		grep -vE "# $interface\$" $RESOLV_CONF > $TMPFILE | ||||
| 		cat $TMPFILE > $RESOLV_CONF | ||||
| 		rm -f $TMPFILE | ||||
| 
 | ||||
| 		# prefer rfc3397 domain search list (option 119) if available | ||||
| 		if [ -n "$search" ]; then | ||||
| 			search_list=$search | ||||
| 		elif [ -n "$domain" ]; then | ||||
| 			search_list=$domain | ||||
| 		fi | ||||
| 
 | ||||
| 		[ -n "$search_list" ] && | ||||
| 			echo "search $search_list" >> $RESOLV_CONF | ||||
| 
 | ||||
| 		for i in $dns ; do | ||||
| 			echo adding dns $i | ||||
| 			echo "nameserver $i" >> $RESOLV_CONF | ||||
| 		done | ||||
| 		;; | ||||
| esac | ||||
| 
 | ||||
| HOOK_DIR="$0.d" | ||||
| for hook in "${HOOK_DIR}/"*; do | ||||
|     [ -f "${hook}" -a -x "${hook}" ] || continue | ||||
|     "${hook}" "${@}" | ||||
| done | ||||
| 
 | ||||
| exit 0 | ||||
|  | @ -836,18 +836,18 @@ CONFIG_ETHER_WAKE=y | |||
| # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set | ||||
| CONFIG_HOSTNAME=y | ||||
| CONFIG_DNSDOMAINNAME=y | ||||
| # CONFIG_HTTPD is not set | ||||
| CONFIG_HTTPD=y | ||||
| # CONFIG_FEATURE_HTTPD_RANGES is not set | ||||
| # CONFIG_FEATURE_HTTPD_SETUID is not set | ||||
| # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set | ||||
| # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set | ||||
| # CONFIG_FEATURE_HTTPD_CGI is not set | ||||
| CONFIG_FEATURE_HTTPD_BASIC_AUTH=y | ||||
| CONFIG_FEATURE_HTTPD_AUTH_MD5=y | ||||
| CONFIG_FEATURE_HTTPD_CGI=y | ||||
| # CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set | ||||
| # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set | ||||
| # CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set | ||||
| # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set | ||||
| CONFIG_FEATURE_HTTPD_ERROR_PAGES=y | ||||
| # CONFIG_FEATURE_HTTPD_PROXY is not set | ||||
| # CONFIG_FEATURE_HTTPD_GZIP is not set | ||||
| CONFIG_FEATURE_HTTPD_GZIP=y | ||||
| CONFIG_IFCONFIG=y | ||||
| CONFIG_FEATURE_IFCONFIG_STATUS=y | ||||
| CONFIG_FEATURE_IFCONFIG_SLIP=y | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue