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

(-)/.safe/:apiary/etc/network.subr (-1 / +21 lines)
Lines 423-429 Link Here
423
		esac
429
		esac
424
	done
430
	done
425
431
426
	checkyesno synchronous_dhclient
432
	checkyesno synchronous_dhclient && return
433
434
	# Auto-switching to SYNCDHCP must only happen if DHCP is defined, so
435
	# check for dhcpif (again for ifconfig_up() usage, but to be safe for
436
	#						other/future consumers)
437
	dhcpif $1 || return
438
439
	# Assume user wants SYNCDHCP if devd(8) was (intentionally) disabled,
440
	# but overseen that ifconfig="DHCP" won't work in that case.
441
	checkyesno devd_enable || return 0
442
443
	# If $skip doesn't list any keyword starting with "nojail" return with
444
	# non zero since the result from 'checkyesno synchronous_dhclient' was
445
        # non zero.
446
	[ "${skip}" != "${skip#* nojail}" ] || return
447
448
	# If $skip doesn't list keyword "nojailvnet" (but "nojail" was found,
449
	# otherwise we would return above), auto-switching to SYNCDHCP happens.
450
	# The test reflects non zero checkyesno synchronous_dhclient' result
451
	# otherwise.
452
	[ "${skip}" = "${skip#* nojailvnet}" ]
427
}
453
}
428
454
429
# wpaif if
455
# wpaif if

Return to bug 280913