Attachment #452988 for bug #697929

View | Details | Raw Unified | Return to bug 697929
Collapse All | Expand All




						if [ "$BOOTING" = yes -a "$RUN_FROM_RC" = yes ] ; then
							link_ready_check "$INTERFACE"
							link_ret=$?
							test "$link_ret" -eq 0 || retcode=$R_DHCP_BG
						else
							link_ready_wait "$INTERFACE" "${LINK_READY_WAIT}"
							link_ret=$?
							test "$link_ret" -eq 0 || retcode=$R_NOTRUNNING
						fi
					fi
				fi

						link_ready_check "$INTERFACE"
						link_ret=$?
						if [ "$BOOTING" = yes -a "$RUN_FROM_RC" = yes ] ; then
							test "$link_ret" -eq 0 || retcode=$R_DHCP_BG
						else
							test "$link_ret" -eq 0 || retcode=$R_NOTRUNNING
						fi
					fi

- 

Return to bug 697929

Lines 1162-1172 case "$BOOTPROTO$SKIP_MAIN_PART" in Link Here

(-)a/scripts/ifup (-5 / +4 lines)
1162	if [ "$BOOTING" = yes -a "$RUN_FROM_RC" = yes ] ; then	1162	if [ "$BOOTING" = yes -a "$RUN_FROM_RC" = yes ] ; then
1163	link_ready_check "$INTERFACE"	1163	link_ready_check "$INTERFACE"
1164	link_ret=$?	1164	link_ret=$?
1165	test "$link_ret" && retcode=$R_DHCP_BG	1165	test "$link_ret" -eq 0 \|\| retcode=$R_DHCP_BG
1166	else	1166	else
1167	link_ready_wait "$INTERFACE" "${LINK_READY_WAIT}"	1167	link_ready_wait "$INTERFACE" "${LINK_READY_WAIT}"
1168	link_ret=$?	1168	link_ret=$?
1169	test "$link_ret" && retcode=$R_NOTRUNNING	1169	test "$link_ret" -eq 0 \|\| retcode=$R_NOTRUNNING
1170	fi	1170	fi
1171	fi	1171	fi
1172	fi	1172	fi
Lines 1241-1249 case "$BOOTPROTO$SKIP_MAIN_PART" in Link Here
1241	link_ready_check "$INTERFACE"	1241	link_ready_check "$INTERFACE"
1242	link_ret=$?	1242	link_ret=$?
1243	if [ "$BOOTING" = yes -a "$RUN_FROM_RC" = yes ] ; then	1243	if [ "$BOOTING" = yes -a "$RUN_FROM_RC" = yes ] ; then
1244	test "$link_ret" && retcode=$R_DHCP_BG	1244	test "$link_ret" -eq 0 \|\| retcode=$R_DHCP_BG
1245	else	1245	else
1246	test "$link_ret" && retcode=$R_NOTRUNNING	1246	test "$link_ret" -eq 0 \|\| retcode=$R_NOTRUNNING
1247	fi	1247	fi
1248	fi	1248	fi
1249		1249
1250	-