From nobody Thu Aug 20 17:46:46 2026 X-Original-To: dev-commits-src-main@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 4hQrTz0w0Tz6pDvS for ; Thu, 20 Aug 2026 17:46:47 +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 4hQrTz0Nxnz3yvF for ; Thu, 20 Aug 2026 17:46:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787248007; 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=/6EZiL4N85HGOXDvGKBGAfsdU9xtN//geBtadwCddqc=; b=E4YIvlQpEwZ0NEgum/5B9/MXMUdXtwiYLroj75Cb+fCOgeiAezIMb0FFolEH5VzBuNZajD FJVtCvthQEc7Uwz9Quc5QJ3hcKWg9HYxDqqoScEx4NOtYlVwYNxmzWH7P0ygNlmxARglnP RX1kENrEAhPNZxquRGhoBFQuf21eLT8TBESRNh6IXfhCE0osYYyuMz08Q7W3WtuqhMm42B 5FeeN3BKX3l6yBCLeOFsP1s6qkTzvVdLyp9T97exQJkwU5BABUkiC0o6G8imfnXKFNe4XX dfuMEStP+zH1lX6aXy+5xYjYzIA/pB4ysU6neX/5T9BMfsx80yUute5H0lkAcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787248007; a=rsa-sha256; cv=none; b=YEDGbnCogLinmVoXSxdaRXmtL8WUWp3P9ih+H2VfF1zWAxlqXX1NU+81lSyONqdPjGPQx/ x6/FsB1P7L7jvkhwBy5WRxh90Lq/paaGSeZlmSUAQilSXX/yppRpRRD3XDDeLN1sYVA3H9 wbdh7GchTB4DFCSiiUg5IhEdsZXX7VOjNnWp1ZIGtHv1sbXCaQgZJnU/6MGiPn7jzSJvOO iBa0DH6BqffxHSCEa/lhqJmWYVhtEsxQYYzcnB7UuzyrdXREI9YeankCTzKIB+ZyziUCNn nyGyuv1DE2S9aLt1i5wKEUcsLDyOxs1GDW/i9POxDWiTCiLI6nQz/pM1hMlQ0Q== 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=1787248007; 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=/6EZiL4N85HGOXDvGKBGAfsdU9xtN//geBtadwCddqc=; b=KZfD844OaOdBTbJu433CoVcU7SqIYZHIzJ0wtyQy6le6bRxtjHgavlSjIYMoNi8myJe4E4 PKx6CJhCTjVK8eGTH2dwio4ZxSppZuxH077g2c88E7vvYPpN/qEuthet4UJeJOtHdjrvOa bVPf5k3kAEnKrJyYMjTLXIOqh7D3ZrwcMvr1e0WY9fB4jLuaEgu9s209i4NEZHIXL4FaEe hpf8RVghXEyYYq+mtVAOxieBby0NqSpi7CyYsasxmVg4SvzCY5or4hrwQfGQd4YcfXM0w1 raE+ANtT4R/ZLeLGQBcMgvcGZIc3IKlm3fE24boiKfyYF8F1o+ASKq6YRmJU+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hQrTy6KkNzBvr for ; Thu, 20 Aug 2026 17:46:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 441d6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Aug 2026 17:46:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Devin Teske Subject: git: c4bca1f88302 - main - New version of jng (9.2) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: c4bca1f8830223766105af486ae70e78d67ae78a Auto-Submitted: auto-generated Date: Thu, 20 Aug 2026 17:46:46 +0000 Message-Id: <6a873d86.441d6.607c9a7b@gitrepo.freebsd.org> The branch main has been updated by dteske: URL: https://cgit.FreeBSD.org/src/commit/?id=c4bca1f8830223766105af486ae70e78d67ae78a commit c4bca1f8830223766105af486ae70e78d67ae78a Author: Devin Teske AuthorDate: 2026-08-20 17:44:55 +0000 Commit: Devin Teske CommitDate: 2026-08-20 17:44:55 +0000 New version of jng (9.2) Use jail.conf(5) $name in the jail.conf examples so the jail name need only be set on the stanza. Keep host.hostname as xxx.yyy; a jail name is not a DNS label. Leave the rc.conf excerpt as xxx. Suggested by: jlduran MFC after: 1 week Reviewed by: kfv, jlduran Differential Revision: https://reviews.freebsd.org/D59032 --- share/examples/jails/jail.xxx.conf | 20 ++++++++++---------- share/examples/jails/jng | 28 ++++++++++++++-------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/share/examples/jails/jail.xxx.conf b/share/examples/jails/jail.xxx.conf index a007ba51c87d..9e36238096f3 100644 --- a/share/examples/jails/jail.xxx.conf +++ b/share/examples/jails/jail.xxx.conf @@ -1,7 +1,7 @@ xxx { host.hostname = "xxx.yyy"; # hostname - path = "/vm/xxx"; # root directory + path = "/vm/$name"; # root directory exec.clean; exec.system_user = "root"; @@ -12,24 +12,24 @@ xxx { # 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) + vnet.interface = "ng0_$name"; # vnet interface(s) + exec.prestart += "jng bridge $name em0"; # bridge interface(s) + exec.prestop += "ifconfig ng0_$name -vnet $name"; # return ifnet(s) + exec.poststop += "jng shutdown $name"; # destroy interface(s) # if_bridge - #vnet.interface = "e0b_xxx"; # vnet interface(s) - #exec.prestart += "jib addm xxx em0"; # bridge interface(s) - #exec.poststop += "jib destroy xxx"; # destroy interface(s) + #vnet.interface = "e0b_$name"; # vnet interface(s) + #exec.prestart += "jib addm $name em0"; # bridge interface(s) + #exec.poststop += "jib destroy $name"; # destroy interface(s) # Standard recipe exec.start += "/bin/sh /etc/rc"; exec.stop = "/bin/sh /etc/rc.shutdown jail"; - exec.consolelog = "/var/log/jail_xxx_console.log"; + exec.consolelog = "/var/log/jail_${name}_console.log"; mount.devfs; # mount devfs # Optional (default off) #devfs_ruleset = "11"; # rule to unhide bpf for DHCP - #allow.mount; # mount /etc/fstab.xxx + #allow.mount; # mount /etc/fstab.$name #allow.set_hostname = 1; # Allow hostname to change #allow.sysvipc = 1; # Allow SysV Interprocess Comm. } diff --git a/share/examples/jails/jng b/share/examples/jails/jng index 0d997588369a..e8d24f3d00ab 100755 --- a/share/examples/jails/jng +++ b/share/examples/jails/jng @@ -7,7 +7,7 @@ ############################################################ IDENT(1) # # $Title: netgraph(4) management script for vnet jails $ -# $Version: 9.1 $ +# $Version: 9.2 $ # ############################################################ INFORMATION # @@ -22,15 +22,15 @@ # # xxx { # host.hostname = "xxx.yyy"; -# path = "/vm/xxx"; +# path = "/vm/$name"; # # # # # NB: Below 2-lines required -# # NB: The number of ngN_xxx interfaces should match the number of -# # arguments given to `jng bridge xxx' in exec.prestart value. +# # NB: The number of ngN_$name interfaces should match the number of +# # arguments given to `jng bridge $name' in exec.prestart value. # # # vnet; -# vnet.interface = ng0_xxx, ng1_xxx, ...; +# vnet.interface = ng0_$name, ng1_$name, ...; # # exec.clean; # exec.system_user = "root"; @@ -38,20 +38,20 @@ # # # # # 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 +# # NB: The number of arguments after `jng bridge $name' should match +# # the number of ngN_$name arguments in vnet.interface value. +# # NB: Return each ngN_$name 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"; +# exec.prestart += "jng bridge $name em0 em1 ..."; +# exec.prestop += "ifconfig ng0_$name -vnet $name"; +# exec.prestop += "ifconfig ng1_$name -vnet $name"; +# exec.poststop += "jng shutdown $name"; # # # Standard recipe # exec.start += "/bin/sh /etc/rc"; # exec.stop = "/bin/sh /etc/rc.shutdown jail"; -# exec.consolelog = "/var/log/jail_xxx_console.log"; +# exec.consolelog = "/var/log/jail_${name}_console.log"; # mount.devfs; # # # Optional (default off) @@ -138,7 +138,7 @@ NG_BRIDGE_MAX_STALENESS=4294967295 ############################################################ GLOBALS -VERSION='$Version: 9.1 $' +VERSION='$Version: 9.2 $' pgm="${0##*/}" # Program basename