From nobody Thu Aug 20 04:41:37 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hQW471CB5z6p5NM for ; Thu, 20 Aug 2026 04:41:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hQW470cRdz3FfZ for ; Thu, 20 Aug 2026 04:41:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787200903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RDitG0X+QIB6EZShzNnil+3Dn2Ycby8lSKrv8S2siCQ=; b=HDJ94gapCcqeCbALybR9DJeo/XvBCzP3HPo5PlrqHq0XQTg6/oArj0FvbSsGX11bYcm4lm tzgu9bE9WpZIs4NJxjFfQZh9nkRHLbVteR3aZpd67ntB++upO5XMBQZKEE+4KiAIFm+vl1 wZoqO3uQrS6jE6akWzI49xxUcMQ4TjGFzXQugICWB9V0spbiyvtuRrmbJlOB383HqED82H JkZZakeoDwzzpi2iAgdSFzx3Xe0bPvi0QttkxQj2Io9OzTTp+13xgPRgyAJUm4tMMZinI7 6NrHg3z8ZbMT0KQT8SO/oiNkYcB6eDDG8SiZArn2PVCdRV7zgvPx05ysW6Tt+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787200903; a=rsa-sha256; cv=none; b=EmTl/ueQ0++iJ6wPTDtG7XF36kGfhO7J0DsK2UIiJ0xr7om9DBN7S+tAj3YMDkHrQJ6Bbl LPne8DVtXkifCJoEvwAXv9bk8k9SV/JPbkyUS3Rup0pyxFEl01SWIbq5Cc+XmJ1kwrl4H0 9zc/t0p6e+4i7lMpb0RW71qFDVlXYvtTSst1kXL1ndc29/i9Jz+3sbTHq4U7ovZ7kiM9zn ZbUth85/qgbUU1SU7zWhx+ic7CSR/+hDdi9kdXRSS2Lm8ytbo80JgCP2FmPhP8FQkC9spU EBRquhVgfSvgobNA+azXJueIZTpgW+9OsJzL75jGNjL33pMNlWm5dY0QI8FFdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787200903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RDitG0X+QIB6EZShzNnil+3Dn2Ycby8lSKrv8S2siCQ=; b=EEk9OIAjPb1/3+MGH1uDGm/WM+1M0CzQ5xoeNRwj5asC9Swp2mTEfdKBRiXdbTLycTrLgh eVdoNrAlZCzAp9WRbThP0EGZJ+N8cNoRvEubb8OBoS2buYnRpiej89i662CBUWN9K41t99 8zl4Hs6k9CkzaOy77Zkyg2iK4G/bI8HRPv7FfpUWGAQ41QTbQW7tD9D90al4BwZeoz3bzL TsdmaY9nHp1Kx2fvgAkIF4rMWdSaL/AAIP6S1WAwcVBoadNaH2XfAqJV8meaJp3UtDwxLm mWkKgW3wGh5vzvzdtr6+MWMG6AViCkq4ZC+FA6LQ8bAjLrdn1xP9JBcQ9NCabw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hQW466kHzz11q1 for ; Thu, 20 Aug 2026 04:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a4a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Aug 2026 04:41:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Devin Teske Subject: git: 8d83b10345da - main - New version of jng (9.1) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dteske X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d83b10345da101e4a24a38c90d99a0df0f48b3b Auto-Submitted: auto-generated Date: Thu, 20 Aug 2026 04:41:37 +0000 Message-Id: <6a868581.3a4a4.60319146@gitrepo.freebsd.org> The branch main has been updated by dteske: URL: https://cgit.FreeBSD.org/src/commit/?id=8d83b10345da101e4a24a38c90d99a0df0f48b3b commit 8d83b10345da101e4a24a38c90d99a0df0f48b3b Author: Devin Teske AuthorDate: 2026-08-20 04:39:23 +0000 Commit: Devin Teske CommitDate: 2026-08-20 04:39:34 +0000 New version of jng (9.1) Update examples and comments to return eifaces in exec.prestop with ifconfig -vnet (before jng shutdown in poststop). Reported by: jlduran PR: 268397 MFC after: 1 week Reviewed by: kfv, jlduran Differential Revision: https://reviews.freebsd.org/D58939 --- share/examples/jails/jail.xxx.conf | 3 ++- share/examples/jails/jng | 18 ++++++++++++------ share/examples/jails/rc.conf.jails | 2 ++ share/examples/jails/rcjail.xxx.conf | 3 ++- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/share/examples/jails/jail.xxx.conf b/share/examples/jails/jail.xxx.conf index 8ada4aa0dd9d..a007ba51c87d 100644 --- a/share/examples/jails/jail.xxx.conf +++ b/share/examples/jails/jail.xxx.conf @@ -8,12 +8,13 @@ xxx { exec.jail_user = "root"; # - # NB: Below 4-lines required + # NB: Below lines required # vnet; # netgraph vnet.interface = "ng0_xxx"; # vnet interface(s) exec.prestart += "jng bridge xxx em0"; # bridge interface(s) + exec.prestop += "ifconfig ng0_xxx -vnet xxx"; # return ifnet(s) exec.poststop += "jng shutdown xxx"; # destroy interface(s) # if_bridge #vnet.interface = "e0b_xxx"; # vnet interface(s) diff --git a/share/examples/jails/jng b/share/examples/jails/jng index 82f1dd7b5e94..0d997588369a 100755 --- a/share/examples/jails/jng +++ b/share/examples/jails/jng @@ -7,14 +7,14 @@ ############################################################ IDENT(1) # # $Title: netgraph(4) management script for vnet jails $ -# $Version: 9.0 $ +# $Version: 9.1 $ # ############################################################ INFORMATION # # Use this tool with jail.conf(5) (or rc.conf(5) ``legacy'' configuration) to # manage `vnet' interfaces for jails. Designed to automate the creation of vnet -# interface(s) during jail `prestart' and destroy said interface(s) during jail -# `poststop'. +# interface(s) during jail `prestart', return them to the host during jail +# `prestop', and destroy said interface(s) during jail `poststop'. # # In jail.conf(5) format: # @@ -37,11 +37,15 @@ # exec.jail_user = "root"; # # # -# # NB: Below 2-lines required +# # NB: Below lines required # # NB: The number of arguments after `jng bridge xxx' should match # # the number of ngN_xxx arguments in vnet.interface value. +# # NB: Return each ngN_xxx to the host in prestop so the kernel does +# # not move it during jail removal (BPF race). Destroy in poststop. # # # exec.prestart += "jng bridge xxx em0 em1 ..."; +# exec.prestop += "ifconfig ng0_xxx -vnet xxx"; +# exec.prestop += "ifconfig ng1_xxx -vnet xxx"; # exec.poststop += "jng shutdown xxx"; # # # Standard recipe @@ -84,7 +88,9 @@ # jail_xxx_rootdir="/vm/xxx" # root directory # jail_xxx_vnet_interfaces="ng0_xxx ng1xxx ..." # vnet interface(s) # jail_xxx_exec_prestart0="jng bridge xxx em0 em1 ..." # bridge interface(s) -# jail_xxx_exec_poststop0="jng shutdown xxx" # destroy interface(s) +# jail_xxx_exec_prestop0="ifconfig ng0_xxx -vnet xxx" # return ifnet(s) +# jail_xxx_exec_prestop1="ifconfig ng1_xxx -vnet xxx" +# jail_xxx_exec_poststop0="jng shutdown xxx" # destroy interface(s) # #jail_xxx_mount_enable="YES" # mount /etc/fstab.xxx # #jail_xxx_devfs_ruleset="11" # rule to unhide bpf for DHCP # @@ -132,7 +138,7 @@ NG_BRIDGE_MAX_STALENESS=4294967295 ############################################################ GLOBALS -VERSION='$Version: 9.0 $' +VERSION='$Version: 9.1 $' pgm="${0##*/}" # Program basename diff --git a/share/examples/jails/rc.conf.jails b/share/examples/jails/rc.conf.jails index b1e0d6187b4e..872ab66d7fc2 100644 --- a/share/examples/jails/rc.conf.jails +++ b/share/examples/jails/rc.conf.jails @@ -35,6 +35,7 @@ jail_devfs_enable="YES" # mount devfs #jail_{name}_rootdir="/vm/{name}" # root directory #jail_{name}_vnet_interfaces="ng0_{name}" # vnet interface(s) #jail_{name}_exec_prestart0="jng bridge {name} em0" # bridge interface(s) +#jail_{name}_exec_prestop0="ifconfig ng0_{name} -vnet {name}" # return ifnet(s) #jail_{name}_exec_poststop0="jng shutdown {name}" # destroy interface(s) # Optional (default off) #jail_{name}_devfs_ruleset="11" # rule to unhide bpf for DHCP @@ -61,6 +62,7 @@ jail_XXX_rootdir="/vm/XXX" # root directory # netgraph jail_XXX_vnet_interface="ng0_XXX" # vnet interface(s) jail_XXX_exec_prestart0="jng bridge XXX em0" # bridge interface(s) +jail_XXX_exec_prestop0="ifconfig ng0_XXX -vnet XXX" # return ifnet(s) jail_XXX_exec_poststop0="jng shutdown XXX" # destroy interface(s) # if_bridge #jail_XXX_vnet_interface="e0b_XXX" # vnet interface(s) diff --git a/share/examples/jails/rcjail.xxx.conf b/share/examples/jails/rcjail.xxx.conf index 8757219a97f3..0ca271ddf9b6 100644 --- a/share/examples/jails/rcjail.xxx.conf +++ b/share/examples/jails/rcjail.xxx.conf @@ -3,11 +3,12 @@ jail_XXX_hostname="XXX.YYY" # hostname jail_XXX_rootdir="/vm/XXX" # root directory # -# NB: Below 3 lines required +# NB: Below lines required # # netgraph jail_XXX_vnet_interface="ng0_XXX" # vnet interface(s) jail_XXX_exec_prestart0="jng bridge XXX em0" # bridge interface(s) +jail_XXX_exec_prestop0="ifconfig ng0_XXX -vnet XXX" # return ifnet(s) jail_XXX_exec_poststop0="jng shutdown XXX" # destroy interface(s) # if_bridge #jail_XXX_vnet_interface="e0b_XXX" # vnet interface(s)