Merge pull request #314 from truenas/os_13.3

NAS-127557 / 24.10 / Switch OS repo to freebsd/releng/13.3 upstream branch
This commit is contained in:
Alexander Motin
2024-02-27 09:51:01 -05:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@@ -4,7 +4,7 @@
# For more information on this file, please read the config(5) manual page,
# and/or the handbook section on Kernel Configuration Files:
#
# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
# https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
#
# The handbook is also available locally in /usr/share/doc/handbook
# if you've installed the doc distribution, otherwise always see the
@@ -16,7 +16,6 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
# $FreeBSD$
cpu HAMMER
ident TRUENAS
@@ -31,6 +30,7 @@ options VIMAGE # Subsystem virtualization, e.g. VNET
options INET # InterNETworking
options INET6 # IPv6 communications protocols
options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5
options NETLINK # netlink(4) support
options ROUTE_MPATH # Multipath routing support
options TCP_OFFLOAD # TCP offload
options TCP_BLACKBOX # Enhanced TCP event logging

View File

@@ -27,7 +27,7 @@ repos += {
"name": "os",
"path": "os",
"url": "https://github.com/freenas/os.git",
"branch": "truenas/13.1-stable"
"branch": "truenas/13.3-stable"
}
repos += {