Attachment 252894 Details for Bug 280913 – auto-switch DHCP rc.conf(5) directive to SYNCDHCP if devd(8) won't take over

[patch] auto-switch DHCP rc.conf(5) directive to SYNCDHCP if devd(8) won't take over

etc_network.subr-autoSNCdhcp.patch (text/plain), 1.12 KB, created by Harald Schmalzbauer on 2024-08-18 19:12:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harald Schmalzbauer

Created: 2024-08-18 19:12:22 UTC

Size: 1.12 KB

patch

obsolete

>--- /var/jails/.template/etc/network.subr	2024-08-12 19:11:50.000000000 +0200
>+++ /.safe/:apiary/etc/network.subr	2024-08-18 20:24:56.034256000 +0200
>@@ -423,7 +429,27 @@
> 		esac
> 	done
> 
>-	checkyesno synchronous_dhclient
>+	checkyesno synchronous_dhclient && return
>+
>+	# Auto-switching to SYNCDHCP must only happen if DHCP is defined, so
>+	# check for dhcpif (again for ifconfig_up() usage, but to be safe for
>+	#						other/future consumers)
>+	dhcpif $1 || return
>+
>+	# Assume user wants SYNCDHCP if devd(8) was (intentionally) disabled,
>+	# but overseen that ifconfig="DHCP" won't work in that case.
>+	checkyesno devd_enable || return 0
>+
>+	# If $skip doesn't list any keyword starting with "nojail" return with
>+	# non zero since the result from 'checkyesno synchronous_dhclient' was
>+        # non zero.
>+	[ "${skip}" != "${skip#* nojail}" ] || return
>+
>+	# If $skip doesn't list keyword "nojailvnet" (but "nojail" was found,
>+	# otherwise we would return above), auto-switching to SYNCDHCP happens.
>+	# The test reflects non zero checkyesno synchronous_dhclient' result
>+	# otherwise.
>+	[ "${skip}" = "${skip#* nojailvnet}" ]
> }
> 
> # wpaif if

Actions: View | Diff

Attachments on bug 280913: 252894