aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/libsys/Makefile.sys4
-rw-r--r--release/tools/vmimage.subr6
-rw-r--r--share/misc/bsd-family-tree120
3 files changed, 68 insertions, 62 deletions
diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys
index 1d1a4f1136ce..5f149170b974 100644
--- a/lib/libsys/Makefile.sys
+++ b/lib/libsys/Makefile.sys
@@ -471,7 +471,9 @@ MLINKS+=intro.2 errno.2
MLINKS+=jail.2 jail_attach.2 \
jail.2 jail_get.2 \
jail.2 jail_remove.2 \
- jail.2 jail_set.2
+ jail.2 jail_set.2 \
+ jail.2 jail_attach_jd.2 \
+ jail.2 jail_remove_jd.2
MLINKS+=kldunload.2 kldunloadf.2
MLINKS+=kqueue.2 kevent.2 \
kqueue.2 kqueue1.2 \
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 8531e9b8f2d6..92f00f9cf7c3 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -449,7 +449,11 @@ vm_create_disk() {
# Create an ESP
espfilename=$(mktemp /tmp/efiboot.XXXXXX)
make_esp_file ${espfilename} ${fat32min} ${BOOTFILES}/efi/loader_lua/loader_lua.efi
- BOOTPARTS="${BOOTPARTS} -p efi/efiboot0:=${espfilename}"
+ espsuffix=""
+ if [ -z "${BOOTPARTS}" ]; then
+ espsuffix="${BOOTPARTSOFFSET}"
+ fi
+ BOOTPARTS="${BOOTPARTS} -p efi/efiboot0:=${espfilename}${espsuffix}"
# Add this to fstab
mkdir -p ${DESTDIR}/boot/efi
diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree
index 82e9ac45c495..fd525d59c902 100644
--- a/share/misc/bsd-family-tree
+++ b/share/misc/bsd-family-tree
@@ -86,7 +86,7 @@ FreeBSD 2.1 | | | |
| | | | *--NetBSD 1.1 -. BSD/OS 2.1
| FreeBSD 2.1.5 | | | \ |
| | | | *--NetBSD 1.2 \ BSD/OS 3.0
- | FreeBSD 2.1.6 | | | \ OpenBSD 2.0 |
+ | FreeBSD 2.1.6 | | | \ OpenBSD 2.0 |
| | | | | \ | |
| FreeBSD 2.1.6.1 | | | \ | |
| | | | | \ | |
@@ -99,38 +99,38 @@ FreeBSD 2.1 | | | |
| \ | | | | |
| FreeBSD 2.2.1 | | | | |
| | | | | | |
- | FreeBSD 2.2.2 | | | OpenBSD 2.1 |
+ | FreeBSD 2.2.2 | | | OpenBSD 2.1 |
| | | | | | |
| FreeBSD 2.2.5 | | | | |
- | | | | | OpenBSD 2.2 |
+ | | | | | OpenBSD 2.2 |
| | | | *--NetBSD 1.3 | |
| FreeBSD 2.2.6 | | | | | |
| | | | | NetBSD 1.3.1 | BSD/OS 3.1
- | | | | | | OpenBSD 2.3 |
+ | | | | | | OpenBSD 2.3 |
| | | | | NetBSD 1.3.2 | |
| FreeBSD 2.2.7 | | | | | |
| | | | | | | BSD/OS 4.0
| FreeBSD 2.2.8 | | | | | |
| | | | | | | |
- | v | | | | OpenBSD 2.4 |
+ | v | | | | OpenBSD 2.4 |
| FreeBSD 2.2.9 | | | | | |
| | | | | | |
FreeBSD 3.0 <--------* | | v | |
| | | NetBSD 1.3.3 | |
*---FreeBSD 3.1 | | | |
| | | | | BSD/OS 4.0.1
- | FreeBSD 3.2----* | .--*--NetBSD 1.4 OpenBSD 2.5 |
+ | FreeBSD 3.2----* | .--*--NetBSD 1.4 OpenBSD 2.5 |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| FreeBSD 3.3 | | | | NetBSD 1.4.1 | |
- | | | | | | | OpenBSD 2.6 |
+ | | | | | | | OpenBSD 2.6 |
| FreeBSD 3.4 | | | | | | |
| | | | | | | | BSD/OS 4.1
FreeBSD 4.0 | | | | | NetBSD 1.4.2 | |
| | | | | | | | |
| | | | | | | | |
- | FreeBSD 3.5 | | | | | OpenBSD 2.7 |
+ | FreeBSD 3.5 | | | | | OpenBSD 2.7 |
| | | | | | | | |
| FreeBSD 3.5.1 | | | | | | |
| | | | | | | |
@@ -139,34 +139,34 @@ FreeBSD 4.0 | | | | | NetBSD 1.4.2 | |
| FreeBSD 4.1.1 | | / | | | |
| | | | / | | | |
| FreeBSD 4.2 Darwin/ | NetBSD 1.4.3 | |
- | | Mac OS X | OpenBSD 2.8 BSD/OS 4.2
+ | | Mac OS X | OpenBSD 2.8 BSD/OS 4.2
| | | | | |
| | | | | |
| | 10.0 *--NetBSD 1.5 | |
| FreeBSD 4.3 | | | | |
- | | | | | OpenBSD 2.9 |
+ | | | | | OpenBSD 2.9 |
| | | | NetBSD 1.5.1 | |
| | | | | | |
| FreeBSD 4.4-. | | NetBSD 1.5.2 | |
| | | Mac OS X | | | |
- | | | 10.1 | | OpenBSD 3.0 |
+ | | | 10.1 | | OpenBSD 3.0 |
| FreeBSD 4.5 | | | | | |
| | \ | | | | BSD/OS 4.3
- | FreeBSD 4.6 \ | | | OpenBSD 3.1 |
+ | FreeBSD 4.6 \ | | | OpenBSD 3.1 |
| | \ | | NetBSD 1.5.3 | |
| FreeBSD 4.6.2 Mac OS X | | |
| | 10.2 | | |
| FreeBSD 4.7 | | | |
- | | | *--NetBSD 1.6 OpenBSD 3.2 |
+ | | | *--NetBSD 1.6 OpenBSD 3.2 |
| FreeBSD 4.8 | | | | |
| | | | NetBSD 1.6.1 | |
- | |--------. | | | OpenBSD 3.3 BSD/OS 5.0
+ | |--------. | | | OpenBSD 3.3 BSD/OS 5.0
| | \ | | | | |
- | FreeBSD 4.9 | | | | OpenBSD 3.4 BSD/OS 5.1 ISE
+ | FreeBSD 4.9 | | | | OpenBSD 3.4 BSD/OS 5.1 ISE
| | | | | | |
| | | | | NetBSD 1.6.2 |
| | | | | | |
- | | | | | | OpenBSD 3.5
+ | | | | | | OpenBSD 3.5
| | | | | v |
| FreeBSD 4.10 | | | |
| | | | | |
@@ -185,74 +185,74 @@ FreeBSD 5.2 | | | |
| FreeBSD 5.2.1 | | | |
| | | | |
*-------FreeBSD 5.3 | | | |
- | | | | OpenBSD 3.6 |
+ | | | | OpenBSD 3.6 |
| | | *--NetBSD 2.0 | |
| | | | | | | DragonFly 1.2.0
| | Mac OS X | | NetBSD 2.0.2 | |
| | 10.4 | | | | |
| FreeBSD 5.4 | | | | | |
- | | | | | | OpenBSD 3.7 |
+ | | | | | | OpenBSD 3.7 |
| | | | | NetBSD 2.0.3 | |
| | | | | | | |
- *--FreeBSD | | | | v OpenBSD 3.8 |
+ *--FreeBSD | | | | v OpenBSD 3.8 |
| 6.0 | | | | | |
| | | | | \ | |
| | | | | NetBSD 2.1 | |
| | | | | | |
| | | | *--NetBSD 3.0 | |
| | | | | | | | DragonFly 1.4.0
- | | | | | | | OpenBSD 3.9 |
+ | | | | | | | OpenBSD 3.9 |
| FreeBSD | | | | | | |
| 6.1 | | | | | | |
| | FreeBSD 5.5 | | | | | |
| | | | | NetBSD 3.0.1 | DragonFly 1.6.0
| | | | | | | |
- | | | | | | OpenBSD 4.0 |
+ | | | | | | OpenBSD 4.0 |
| | | | | NetBSD 3.0.2 | |
| | | | NetBSD 3.1 | |
| FreeBSD 6.2 | | | |
| | | | | DragonFly 1.8.0
- | | | | OpenBSD 4.1 |
+ | | | | OpenBSD 4.1 |
| | | | | DragonFly 1.10.0
| | Mac OS X | | |
| | 10.5 | | |
- | | | | OpenBSD 4.2 |
+ | | | | OpenBSD 4.2 |
| | | *--NetBSD 4.0 | |
| FreeBSD 6.3 | | | | |
| \ | | | | |
*--FreeBSD | | | | | DragonFly 1.12.0
| 7.0 | | | | | |
- | | | | | | OpenBSD 4.3 |
+ | | | | | | OpenBSD 4.3 |
| | | | | NetBSD | DragonFly 2.0.0
- | | FreeBSD | | 4.0.1 OpenBSD 4.4 |
+ | | FreeBSD | | 4.0.1 OpenBSD 4.4 |
| | 6.4 | | | |
| | | | | |
| FreeBSD 7.1 | | | |
| | | | | DragonFly 2.2.0
- | FreeBSD 7.2 | *--NetBSD OpenBSD 4.5 |
+ | FreeBSD 7.2 | *--NetBSD OpenBSD 4.5 |
| \ | | 5.0 | |
| \ | | / | \ | |
| | Mac OS X | | | \ | |
| | 10.6 | | | \ | |
| | | | | | NetBSD | DragonFly 2.4.0
- | | | | | | 5.0.1 OpenBSD 4.6 |
+ | | | | | | 5.0.1 OpenBSD 4.6 |
| | | | | | | | |
*--FreeBSD | | | | | | | |
| 8.0 | | | | | | | |
| | FreeBSD | | | | NetBSD | |
| | 7.3 | | | | 5.0.2 | DragonFly 2.6.0
- | | | | | | | OpenBSD 4.7 |
+ | | | | | | | OpenBSD 4.7 |
| FreeBSD | | | | | | |
| 8.1 | | | | | | |
| | | | | | | | DragonFly 2.8.2
- | | | | | | | OpenBSD 4.8 |
+ | | | | | | | OpenBSD 4.8 |
| | | | | | *--NetBSD | |
| FreeBSD FreeBSD | | | 5.1 | |
| 8.2 7.4 | | | | | DragonFly 2.10.1
- | | | | | | OpenBSD 4.9 |
+ | | | | | | OpenBSD 4.9 |
| `-----. Mac OS X | | | | |
| \ 10.7 | | | | |
- | | | | | | OpenBSD 5.0 |
+ | | | | | | OpenBSD 5.0 |
*--FreeBSD | | | | | | |
| 9.0 | | | | NetBSD | DragonFly 3.0.1
| | FreeBSD | | | 5.1.2 | |
@@ -262,12 +262,12 @@ FreeBSD 5.2 | | | |
| | | | | | | | |
| | | | | | NetBSD | |
| | | | | | 5.1.4 | |
- | | | | | | OpenBSD 5.1 |
+ | | | | | | OpenBSD 5.1 |
| | | Mac OS X | `--------. | |
| | | 10.8 | | | |
| | | | *--NetBSD | | |
| | | | | 6.0 | | |
- | | | | | | | | OpenBSD 5.2 DragonFly 3.2.1
+ | | | | | | | | OpenBSD 5.2 DragonFly 3.2.1
| FreeBSD | | | | | NetBSD | |
| 9.1 | | | | | 5.2 | |
| | | | | | | | | |
@@ -280,7 +280,7 @@ FreeBSD 5.2 | | | |
| | | | | | \ | |
| | | | | | NetBSD | |
| | | | | | 6.0.1 | |
- | | | | | | | OpenBSD 5.3 DragonFly 3.4.1
+ | | | | | | | OpenBSD 5.3 DragonFly 3.4.1
| | | | | | NetBSD | |
| | | | | | 6.0.2 | |
| | | | | | | | |
@@ -305,7 +305,7 @@ FreeBSD 5.2 | | | |
| FreeBSD | | NetBSD | |
| 9.2 | | 6.1.2 | |
| | Mac OS X | | | |
- | | 10.9 | | OpenBSD 5.4 |
+ | | 10.9 | | OpenBSD 5.4 |
| `-----. | | | | DragonFly 3.6.0
| \ | | | | |
*--FreeBSD | | | NetBSD | |
@@ -318,7 +318,7 @@ FreeBSD 5.2 | | | |
| | | | | NetBSD | |
| | | | | 6.1.4 | |
| | | | | | | |
- | | | | | | OpenBSD 5.5 |
+ | | | | | | OpenBSD 5.5 |
| | | | | | | |
| | | | | | | DragonFly 3.8.0
| | | | | | | |
@@ -334,7 +334,7 @@ FreeBSD 5.2 | | | |
| | | | 6.1.5 | |
| | Mac OS X | | |
| | 10.10 | | |
- | | | | OpenBSD 5.6 |
+ | | | | OpenBSD 5.6 |
| FreeBSD | | | |
| 10.1 | | | DragonFly 4.0.1
| | | | | |
@@ -346,21 +346,21 @@ FreeBSD 5.2 | | | |
| | | | | |
| | | | | DragonFly 4.0.5
| | | | | |
- | | | | OpenBSD 5.7 |
+ | | | | OpenBSD 5.7 |
| | | | | DragonFly 4.2.0
| FreeBSD | | | |
| 10.2 | | | |
| | macOS *--NetBSD 7.0 | |
- | | 10.11 | | | OpenBSD 5.8 |
+ | | 10.11 | | | OpenBSD 5.8 |
| | | | | `--. | DragonFly 4.4.1
- | FreeBSD | | | | OpenBSD 5.9 |
+ | FreeBSD | | | | OpenBSD 5.9 |
| 10.3 | | | | | |
| | | | | NetBSD | |
| | | | | 7.0.1 | |
| `------. | | | | | DragonFly 4.6.0
| | | | | | | |
| | | | | | | |
- *--FreeBSD | macOS | | | OpenBSD 6.0 |
+ *--FreeBSD | macOS | | | OpenBSD 6.0 |
| 11.0 | 10.12 | | NetBSD | |
| | | | | | 7.0.2 | |
| | | | | | | |
@@ -369,10 +369,10 @@ FreeBSD 5.2 | | | |
| | | | | | | | |
| | | | | | | | |
| | | macOS | | | | DragonFly 4.8.0
- | | | 10.13 | | | OpenBSD 6.1 |
+ | | | 10.13 | | | OpenBSD 6.1 |
| FreeBSD | | | | | | DragonFly 5.0.0
| 11.1 FreeBSD | | | | | |
- | | 10.4 | | | | OpenBSD 6.2 DragonFly 5.0.1
+ | | 10.4 | | | | OpenBSD 6.2 DragonFly 5.0.1
| | | | | | | |
| `------. | | | NetBSD | DragonFly 5.0.2
| | | | | 7.1.1 | |
@@ -380,7 +380,7 @@ FreeBSD 5.2 | | | |
| | | | | NetBSD | |
| | | | | 7.1.2 `--. |
| | | | | | |
- | | | | `-----. OpenBSD 6.3 |
+ | | | | `-----. OpenBSD 6.3 |
| | | *--NetBSD | | DragonFly 5.2.0
| | | | 8.0 | | |
| | | | | | | DragonFly 5.2.1
@@ -389,12 +389,12 @@ FreeBSD 5.2 | | | |
| FreeBSD | | | *--NetBSD | |
| 11.2 | | | 7.2 | |
| | macOS | | | |
- | | 10.14 | | OpenBSD 6.4 |
+ | | 10.14 | | OpenBSD 6.4 |
| | | | | | |
| | | | | | DragonFly 5.4.0
*--FreeBSD | | | | | |
| 12.0 | | | | | DragonFly 5.4.1
- | | | | | | OpenBSD 6.5 |
+ | | | | | | OpenBSD 6.5 |
| | | | | | | |
| | | | | NetBSD | |
| | | | | 8.1 | DragonFly 5.6
@@ -402,7 +402,7 @@ FreeBSD 5.2 | | | |
| | | | | | | DragonFly 5.6.1
| | FreeBSD macOS | | | |
| | 11.3 10.15 | | | |
- | FreeBSD | | | | OpenBSD 6.6 |
+ | FreeBSD | | | | OpenBSD 6.6 |
| 12.1 | macOS | `-------. | |
| | | 10.15.1 | | | DragonFly 5.6.2
| | | | *--NetBSD | | |
@@ -414,43 +414,43 @@ FreeBSD 5.2 | | | |
| | | | | | NetBSD | |
| | | | | | 8.2 | |
| | | | | | | | DragonFly 5.8.1
- | | | | | | | OpenBSD 6.7 |
+ | | | | | | | OpenBSD 6.7 |
| | FreeBSD | | | | | |
| | 11.4 | | | | | |
| | | | | | | DragonFly 5.8.2
| | | | | | | DragonFly 5.8.3
- | | | | NetBSD | OpenBSD 6.8 |
+ | | | | NetBSD | OpenBSD 6.8 |
| FreeBSD macOS | 9.1 | | |
| 12.2 11 | | | | |
| | | | | | | |
| `------. | | | | | |
| | | | | | | |
*--FreeBSD | | | | | | |
- | 13.0 | | | NetBSD | OpenBSD 6.9 DragonFly 6.0.0
+ | 13.0 | | | NetBSD | OpenBSD 6.9 DragonFly 6.0.0
| | | | | 9.2 | | |
| | | | | | | | DragonFly 6.0.1
| | | | | | | | |
- | | FreeBSD macOS | | | OpenBSD 7.0 |
+ | | FreeBSD macOS | | | OpenBSD 7.0 |
| | 12.3 12 | | | | |
| | | | | | | | DragonFly 6.2.1
- | | | | | | | OpenBSD 7.1 |
+ | | | | | | | OpenBSD 7.1 |
| FreeBSD | | | | | | |
| 13.1 | | | | | | |
| | | | | | | | DragonFly 6.2.2
| | | | | NetBSD | | |
- | | | macOS | 9.3 | OpenBSD 7.2 |
+ | | | macOS | 9.3 | OpenBSD 7.2 |
| | | 13 | | | | |
| | FreeBSD | | | | | |
| | 12.4 | | | | | |
| | | | | | | DragonFly 6.4.0
- | | | | | | OpenBSD 7.3 |
+ | | | | | | OpenBSD 7.3 |
| FreeBSD | | | | | |
| 13.2 | | | | | |
| | | | | | | |
| `------. | | | | | |
| | macOS | | | | |
| | 14 | | | | |
- | | | | | | OpenBSD 7.4 |
+ | | | | | | OpenBSD 7.4 |
*--FreeBSD | | | | | | |
| 14.0 | | | | | | |
| | | | | | | | |
@@ -460,7 +460,7 @@ FreeBSD 5.2 | | | |
| | | | *--NetBSD | | |
| | | | | 10.0 | | |
| | | | | | | | |
- | | | | | | | OpenBSD 7.5 |
+ | | | | | | | OpenBSD 7.5 |
| | | | | | NetBSD | |
| | | | | | 8.3 | |
| FreeBSD | | | | | |
@@ -468,23 +468,23 @@ FreeBSD 5.2 | | | |
| | | macOS | | | |
| | | 15 | | | |
| | FreeBSD | | | | |
- | | 13.4 | | | OpenBSD 7.6 |
+ | | 13.4 | | | OpenBSD 7.6 |
| FreeBSD | | | | | |
| 14.2 | | | | | |
| | | | | NetBSD | |
| | | | | 10.1 | |
| | FreeBSD | | | |
| | 13.5 | | | |
- | | | | OpenBSD 7.7 |
+ | | | | OpenBSD 7.7 |
| | | | | DragonFly 6.4.1
| | | | | DragonFly 6.4.2
| FreeBSD | | | |
| 14.3 | | | |
| macOS | | |
| 26 | | |
- | | | OpenBSD 7.8 |
+ | | | OpenBSD 7.8 |
| | | | |
-FreeBSD 16 -current | NetBSD -current OpenBSD -current DragonFly -current
+FreeBSD 16 -current | NetBSD -current OpenBSD -current DragonFly -current
| | | | |
v v v v v
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-07 14:14:16 +0000