Attachment #124306 for bug #178756

Lines 450-456 Link Here

(-)busy-config.old (-1 / +1 lines)
450	# CONFIG_FAKEIDENTD is not set	450	# CONFIG_FAKEIDENTD is not set
451	# CONFIG_FTPGET is not set	451	# CONFIG_FTPGET is not set
452	# CONFIG_FTPPUT is not set	452	# CONFIG_FTPPUT is not set
453	# CONFIG_HOSTNAME is not set	453	CONFIG_HOSTNAME=yes
454	# CONFIG_HTTPD is not set	454	# CONFIG_HTTPD is not set
455	# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set	455	# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set
456	# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set	456	# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set




}

findnfsmount() {
	if [ "${IP}" != '' ] || busybox udhcpc -n -s /bin/udhcpc.scripts
	if [ "${IP}" != '' ] || busybox udhcpc -R rootpath -n -s /bin/udhcpc.scripts
	then
		# kill dhcp server (runs as busybox)
		busybox killall busybox

		[ -e /rootpath ] && NFSROOT=`cat /rootpath`

		if [ "${NFSROOT}" = '' ]

				fi
			else	
				good_msg "Attemping to mount NFS root on ${NFSROOT}"
				mount -t nfs -o ${REAL_ROOTFLAGS} ${NFSROOT} ${NEW_ROOT}
				if [ "$?" = '0' ]
				then
					REAL_ROOT="/dev/nfs"

Lines 5-10 Link Here

(-)udhcpc.scripts.old (+1 lines)
5	[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"	5	[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
6	[ -n "$subnet" ] && NETMASK="netmask $subnet"	6	[ -n "$subnet" ] && NETMASK="netmask $subnet"
7	[ -n "$rootpath" ] && echo "$rootpath" > /rootpath	7	[ -n "$rootpath" ] && echo "$rootpath" > /rootpath
		8	[ -n "$hostname" ] && busybox hostname $(echo "$hostname" \|cut -d '.' -f1)
8	#[ -n "$router" ] && echo "$router" > /router	9	#[ -n "$router" ] && echo "$router" > /router
9	#[ -n "$dns" ] && echo "$dns" > /dns	10	#[ -n "$dns" ] && echo "$dns" > /dns
10		11

Return to bug 178756

Lines 157-165 Link Here

(-)initrd.scripts.old (-3 / +5 lines)
157	}	157	}
158		158
159	findnfsmount() {	159	findnfsmount() {
160		160	if [ "${IP}" != '' ] \|\| busybox udhcpc -n -s /bin/udhcpc.scripts
161	if [ "${IP}" != '' ] \|\| busybox udhcpc -R rootpath -n -s /bin/udhcpc.scripts
162	then	161	then
		162	# kill dhcp server (runs as busybox)
		163	busybox killall busybox
		164
163	[ -e /rootpath ] && NFSROOT=`cat /rootpath`	165	[ -e /rootpath ] && NFSROOT=`cat /rootpath`
164		166
165	if [ "${NFSROOT}" = '' ]	167	if [ "${NFSROOT}" = '' ]
Lines 208-214 Link Here
208	fi	210	fi
209	else	211	else
210	good_msg "Attemping to mount NFS root on ${NFSROOT}"	212	good_msg "Attemping to mount NFS root on ${NFSROOT}"
211	mount -t nfs -o ro,nolock,rsize=1024,wsize=1024 ${NFSROOT} ${NEW_ROOT}	213	mount -t nfs -o ${REAL_ROOTFLAGS} ${NFSROOT} ${NEW_ROOT}
212	if [ "$?" = '0' ]	214	if [ "$?" = '0' ]
213	then	215	then
214	REAL_ROOT="/dev/nfs"	216	REAL_ROOT="/dev/nfs"