diff options
Diffstat (limited to 'upstream/debian-bookworm')
83 files changed, 1055 insertions, 346 deletions
diff --git a/upstream/debian-bookworm/man1/chattr.1 b/upstream/debian-bookworm/man1/chattr.1 index 1ba1bf18..4ee1ad50 100644 --- a/upstream/debian-bookworm/man1/chattr.1 +++ b/upstream/debian-bookworm/man1/chattr.1 @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH CHATTR 1 "February 2023" "E2fsprogs version 1.47.0" +.TH CHATTR 1 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME chattr \- change file attributes on a Linux file system .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man1/dbwrap_tool.1 b/upstream/debian-bookworm/man1/dbwrap_tool.1 index 0c1ff23b..fb52bbc9 100644 --- a/upstream/debian-bookworm/man1/dbwrap_tool.1 +++ b/upstream/debian-bookworm/man1/dbwrap_tool.1 @@ -2,12 +2,12 @@ .\" Title: dbwrap_tool .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 02/05/2024 +.\" Date: 05/08/2024 .\" Manual: System Administration tools -.\" Source: Samba 4.19.4-Debian +.\" Source: Samba 4.19.6-Debian .\" Language: English .\" -.TH "DBWRAP_TOOL" "1" "02/05/2024" "Samba 4\&.19\&.4\-Debian" "System Administration tools" +.TH "DBWRAP_TOOL" "1" "05/08/2024" "Samba 4\&.19\&.6\-Debian" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -317,7 +317,7 @@ dbwrap_tool Use with caution! .SH "VERSION" .PP -This man page is part of version 4\&.19\&.4\-Debian of the Samba suite\&. +This man page is part of version 4\&.19\&.6\-Debian of the Samba suite\&. .SH "SEE ALSO" .PP \fBsmbd\fR(8), diff --git a/upstream/debian-bookworm/man1/grub-editenv.1 b/upstream/debian-bookworm/man1/grub-editenv.1 index a1a6146b..6bdf1ff1 100644 --- a/upstream/debian-bookworm/man1/grub-editenv.1 +++ b/upstream/debian-bookworm/man1/grub-editenv.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-EDITENV "1" "October 2023" "GRUB 2.06-13+deb12u1" "User Commands" +.TH GRUB-EDITENV "1" "February 2024" "GRUB 2.12-1~bpo12+1" "User Commands" .SH NAME grub-editenv \- edit GRUB environment block .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man1/grub-emu.1 b/upstream/debian-bookworm/man1/grub-emu.1 index ffea7f44..779d8dc0 100644 --- a/upstream/debian-bookworm/man1/grub-emu.1 +++ b/upstream/debian-bookworm/man1/grub-emu.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-EMU "1" "October 2023" "GRUB 2.06-13+deb12u1" "User Commands" +.TH GRUB-EMU "1" "February 2024" "GRUB 2.12-1~bpo12+1" "User Commands" .SH NAME grub-emu \- GRUB emulator .SH SYNOPSIS @@ -15,19 +15,24 @@ use GRUB files in the directory DIR \fB\-H\fR, \fB\-\-hold\fR[=\fI\,SECS\/\fR] wait until a debugger will attach .TP +\fB\-\-memdisk\fR=\fI\,FILE\/\fR +use FILE as memdisk +.TP \fB\-m\fR, \fB\-\-device\-map\fR=\fI\,FILE\/\fR use FILE as the device map [default=/boot/grub/device.map] .TP -\fB\-\-memdisk\fR=\fI\,FILE\/\fR -use FILE as memdisk -.TP \fB\-r\fR, \fB\-\-root\fR=\fI\,DEVICE_NAME\/\fR Set root device. .TP \fB\-v\fR, \fB\-\-verbose\fR print verbose messages. .TP +\fB\-X\fR, \fB\-\-kexec\fR +use kexec to boot Linux kernels via systemctl +(pass twice to enable dangerous fallback to +non\-systemctl). +.TP \-?, \fB\-\-help\fR give this help list .TP diff --git a/upstream/debian-bookworm/man1/grub-file.1 b/upstream/debian-bookworm/man1/grub-file.1 index 8283a09c..2bc7ad7f 100644 --- a/upstream/debian-bookworm/man1/grub-file.1 +++ b/upstream/debian-bookworm/man1/grub-file.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-FILE "1" "October 2023" "GRUB 2.06-13+deb12u1" "User Commands" +.TH GRUB-FILE "1" "February 2024" "GRUB 2.12-1~bpo12+1" "User Commands" .SH NAME grub-file \- check file type .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man1/grub-fstest.1 b/upstream/debian-bookworm/man1/grub-fstest.1 index f039580b..203b35ce 100644 --- a/upstream/debian-bookworm/man1/grub-fstest.1 +++ b/upstream/debian-bookworm/man1/grub-fstest.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-FSTEST "1" "October 2023" "GRUB 2.06-13+deb12u1" "User Commands" +.TH GRUB-FSTEST "1" "February 2024" "GRUB 2.12-1~bpo12+1" "User Commands" .SH NAME grub-fstest \- debug tool for GRUB filesystem drivers .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man1/grub-glue-efi.1 b/upstream/debian-bookworm/man1/grub-glue-efi.1 index 89ddb73e..17abbf89 100644 --- a/upstream/debian-bookworm/man1/grub-glue-efi.1 +++ b/upstream/debian-bookworm/man1/grub-glue-efi.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-GLUE-EFI "1" "October 2023" "GRUB 2.06-13+deb12u1" "User Commands" +.TH GRUB-GLUE-EFI "1" "February 2024" "GRUB 2.12-1~bpo12+1" "User Commands" .SH NAME grub-glue-efi \- generate a fat binary for EFI .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man1/grub-kbdcomp.1 b/upstream/debian-bookworm/man1/grub-kbdcomp.1 index 4b02633c..730e20d3 100644 --- a/upstream/debian-bookworm/man1/grub-kbdcomp.1 +++ b/upstream/debian-bookworm/man1/grub-kbdcomp.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-KBDCOMP "1" "October 2023" "grub-kbdcomp ()" "User Commands" +.TH GRUB-KBDCOMP "1" "February 2024" "grub-kbdcomp ()" "User Commands" .SH NAME grub-kbdcomp \- generate a GRUB keyboard layout file .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man1/grub-menulst2cfg.1 b/upstream/debian-bookworm/man1/grub-menulst2cfg.1 index 744304dd..3acf6992 100644 --- a/upstream/debian-bookworm/man1/grub-menulst2cfg.1 +++ b/upstream/debian-bookworm/man1/grub-menulst2cfg.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-MENULST2CFG "1" "October 2023" "Usage: grub-menulst2cfg [INFILE [OUTFILE]]" "User Commands" +.TH GRUB-MENULST2CFG "1" "February 2024" "Usage: grub-menulst2cfg [INFILE [OUTFILE]]" "User Commands" .SH NAME grub-menulst2cfg \- transform legacy menu.lst into grub.cfg .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man1/grub-mkfont.1 b/upstream/debian-bookworm/man1/grub-mkfont.1 index 90bf64a4..b4c6313d 100644 --- a/upstream/debian-bookworm/man1/grub-mkfont.1 +++ b/upstream/debian-bookworm/man1/grub-mkfont.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-MKFONT "1" "October 2023" "GRUB 2.06-13+deb12u1" "User Commands" +.TH GRUB-MKFONT "1" "February 2024" "GRUB 2.12-1~bpo12+1" "User Commands" .SH NAME grub-mkfont \- make GRUB font files .SH SYNOPSIS @@ -23,15 +23,15 @@ set font descent \fB\-i\fR, \fB\-\-index\fR=\fI\,NUM\/\fR select face index .TP -\fB\-n\fR, \fB\-\-name\fR=\fI\,NAME\/\fR -set font family name -.TP \fB\-\-no\-bitmap\fR ignore bitmap strikes when loading .TP \fB\-\-no\-hinting\fR disable hinting .TP +\fB\-n\fR, \fB\-\-name\fR=\fI\,NAME\/\fR +set font family name +.TP \fB\-o\fR, \fB\-\-output\fR=\fI\,FILE\/\fR save output in FILE [required] .TP diff --git a/upstream/debian-bookworm/man1/grub-mkimage.1 b/upstream/debian-bookworm/man1/grub-mkimage.1 index fe943c3c..64adbb07 100644 --- a/upstream/debian-bookworm/man1/grub-mkimage.1 +++ b/upstream/debian-bookworm/man1/grub-mkimage.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-MKIMAGE "1" "October 2023" "GRUB 2.06-13+deb12u1" "User Commands" +.TH GRUB-MKIMAGE "1" "February 2024" "GRUB 2.12-1~bpo12+1" "User Commands" .SH NAME grub-mkimage \- make a bootable image of GRUB .SH SYNOPSIS @@ -14,13 +14,13 @@ embed FILE as an early config \fB\-C\fR, \fB\-\-compression=\fR(xz|none|auto) choose the compression to use for core image .TP +\fB\-\-disable\-shim\-lock\fR +disable shim_lock verifier +.TP \fB\-d\fR, \fB\-\-directory\fR=\fI\,DIR\/\fR use images and modules under DIR [default=/usr/lib/grub/<platform>] .TP -\fB\-\-disable\-shim\-lock\fR -disable shim_lock verifier -.TP \fB\-D\fR, \fB\-\-dtb\fR=\fI\,FILE\/\fR embed FILE as a device tree (DTB) .TP @@ -55,7 +55,8 @@ mipsel\-arc, mipsel\-qemu_mips\-elf, mips\-qemu_mips\-flash, mipsel\-qemu_mips\-flash, mips\-qemu_mips\-elf, arm\-uboot, arm\-coreboot\-vexpress, arm\-coreboot\-veyron, -arm\-efi, arm64\-efi, riscv32\-efi, riscv64\-efi +arm\-efi, arm64\-efi, loongarch64\-efi, riscv32\-efi, +riscv64\-efi .TP \fB\-p\fR, \fB\-\-prefix\fR=\fI\,DIR\/\fR set prefix directory diff --git a/upstream/debian-bookworm/man1/grub-mklayout.1 b/upstream/debian-bookworm/man1/grub-mklayout.1 index b95ec79f..a196d575 100644 --- a/upstream/debian-bookworm/man1/grub-mklayout.1 +++ b/upstream/debian-bookworm/man1/grub-mklayout.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-MKLAYOUT "1" "October 2023" "GRUB 2.06-13+deb12u1" "User Commands" +.TH GRUB-MKLAYOUT "1" "February 2024" "GRUB 2.12-1~bpo12+1" "User Commands" .SH NAME grub-mklayout \- generate a GRUB keyboard layout file .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man1/grub-mknetdir.1 b/upstream/debian-bookworm/man1/grub-mknetdir.1 index c925985c..f2cad307 100644 --- a/upstream/debian-bookworm/man1/grub-mknetdir.1 +++ b/upstream/debian-bookworm/man1/grub-mknetdir.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-MKNETDIR "1" "October 2023" "GRUB 2.06-13+deb12u1" "User Commands" +.TH GRUB-MKNETDIR "1" "February 2024" "GRUB 2.12-1~bpo12+1" "User Commands" .SH NAME grub-mknetdir \- prepare a GRUB netboot directory. .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man1/grub-mkpasswd-pbkdf2.1 b/upstream/debian-bookworm/man1/grub-mkpasswd-pbkdf2.1 index 8887e326..f9f4ee47 100644 --- a/upstream/debian-bookworm/man1/grub-mkpasswd-pbkdf2.1 +++ b/upstream/debian-bookworm/man1/grub-mkpasswd-pbkdf2.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-MKPASSWD-PBKDF2 "1" "October 2023" "GRUB 2.06-13+deb12u1" "User Commands" +.TH GRUB-MKPASSWD-PBKDF2 "1" "February 2024" "GRUB 2.12-1~bpo12+1" "User Commands" .SH NAME grub-mkpasswd-pbkdf2 \- generate hashed password for GRUB .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man1/grub-mkrelpath.1 b/upstream/debian-bookworm/man1/grub-mkrelpath.1 index f6592834..3bdf0c38 100644 --- a/upstream/debian-bookworm/man1/grub-mkrelpath.1 +++ b/upstream/debian-bookworm/man1/grub-mkrelpath.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-MKRELPATH "1" "October 2023" "GRUB 2.06-13+deb12u1" "User Commands" +.TH GRUB-MKRELPATH "1" "February 2024" "GRUB 2.12-1~bpo12+1" "User Commands" .SH NAME grub-mkrelpath \- make a system path relative to its root .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man1/grub-mkrescue.1 b/upstream/debian-bookworm/man1/grub-mkrescue.1 index eed987e1..595acf14 100644 --- a/upstream/debian-bookworm/man1/grub-mkrescue.1 +++ b/upstream/debian-bookworm/man1/grub-mkrescue.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-MKRESCUE "1" "October 2023" "GRUB 2.06-13+deb12u1" "User Commands" +.TH GRUB-MKRESCUE "1" "February 2024" "GRUB 2.12-1~bpo12+1" "User Commands" .SH NAME grub-mkrescue \- make a GRUB rescue image .SH SYNOPSIS @@ -11,6 +11,9 @@ Make GRUB CD\-ROM, disk, pendrive and floppy bootable image. \fB\-\-compress\fR=\fI\,no\/\fR|xz|gz|lzo compress GRUB files [optional] .TP +\fB\-\-disable\-shim\-lock\fR +disable shim_lock verifier +.TP \fB\-\-dtb\fR=\fI\,FILE\/\fR embed a specific DTB .TP @@ -18,9 +21,6 @@ embed a specific DTB use images and modules under DIR [default=/usr/lib/grub/<platform>] .TP -\fB\-\-disable\-shim\-lock\fR -disable shim_lock verifier -.TP \fB\-\-fonts\fR=\fI\,FONTS\/\fR install FONTS [default=unicode] .TP diff --git a/upstream/debian-bookworm/man1/grub-mkstandalone.1 b/upstream/debian-bookworm/man1/grub-mkstandalone.1 index b62126a7..275d57ac 100644 --- a/upstream/debian-bookworm/man1/grub-mkstandalone.1 +++ b/upstream/debian-bookworm/man1/grub-mkstandalone.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-MKSTANDALONE "1" "October 2023" "GRUB 2.06-13+deb12u1" "User Commands" +.TH GRUB-MKSTANDALONE "1" "February 2024" "GRUB 2.12-1~bpo12+1" "User Commands" .SH NAME grub-mkstandalone \- make a memdisk-based GRUB image .SH SYNOPSIS @@ -69,7 +69,8 @@ mipsel\-arc, mipsel\-qemu_mips\-elf, mips\-qemu_mips\-flash, mipsel\-qemu_mips\-flash, mips\-qemu_mips\-elf, arm\-uboot, arm\-coreboot\-vexpress, arm\-coreboot\-veyron, -arm\-efi, arm64\-efi, riscv32\-efi, riscv64\-efi +arm\-efi, arm64\-efi, loongarch64\-efi, riscv32\-efi, +riscv64\-efi .TP \-?, \fB\-\-help\fR give this help list diff --git a/upstream/debian-bookworm/man1/grub-mount.1 b/upstream/debian-bookworm/man1/grub-mount.1 index 7c9192d4..3c226be7 100644 --- a/upstream/debian-bookworm/man1/grub-mount.1 +++ b/upstream/debian-bookworm/man1/grub-mount.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-MOUNT "1" "October 2023" "GRUB 2.06-13+deb12u1" "User Commands" +.TH GRUB-MOUNT "1" "February 2024" "GRUB 2.12-1~bpo12+1" "User Commands" .SH NAME grub-mount \- export GRUB filesystem with FUSE .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man1/grub-render-label.1 b/upstream/debian-bookworm/man1/grub-render-label.1 index 889bafc2..2f392ab6 100644 --- a/upstream/debian-bookworm/man1/grub-render-label.1 +++ b/upstream/debian-bookworm/man1/grub-render-label.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-RENDER-LABEL "1" "October 2023" "GRUB 2.06-13+deb12u1" "User Commands" +.TH GRUB-RENDER-LABEL "1" "February 2024" "GRUB 2.12-1~bpo12+1" "User Commands" .SH NAME grub-render-label \- generate a .disk_label for Apple Macs. .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man1/grub-script-check.1 b/upstream/debian-bookworm/man1/grub-script-check.1 index 3aa5b93a..50a82508 100644 --- a/upstream/debian-bookworm/man1/grub-script-check.1 +++ b/upstream/debian-bookworm/man1/grub-script-check.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-SCRIPT-CHECK "1" "October 2023" "GRUB 2.06-13+deb12u1" "User Commands" +.TH GRUB-SCRIPT-CHECK "1" "February 2024" "GRUB 2.12-1~bpo12+1" "User Commands" .SH NAME grub-script-check \- check grub.cfg for syntax errors .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man1/grub-syslinux2cfg.1 b/upstream/debian-bookworm/man1/grub-syslinux2cfg.1 index aa5c032e..4908a925 100644 --- a/upstream/debian-bookworm/man1/grub-syslinux2cfg.1 +++ b/upstream/debian-bookworm/man1/grub-syslinux2cfg.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-SYSLINUX2CFG "1" "October 2023" "GRUB 2.06-13+deb12u1" "User Commands" +.TH GRUB-SYSLINUX2CFG "1" "February 2024" "GRUB 2.12-1~bpo12+1" "User Commands" .SH NAME grub-syslinux2cfg \- transform syslinux config into grub.cfg .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man1/lsattr.1 b/upstream/debian-bookworm/man1/lsattr.1 index c95d859b..7e48534a 100644 --- a/upstream/debian-bookworm/man1/lsattr.1 +++ b/upstream/debian-bookworm/man1/lsattr.1 @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH LSATTR 1 "February 2023" "E2fsprogs version 1.47.0" +.TH LSATTR 1 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME lsattr \- list file attributes on a Linux second extended file system .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man1/mkosi.1 b/upstream/debian-bookworm/man1/mkosi.1 index 717545e2..8753e682 100644 --- a/upstream/debian-bookworm/man1/mkosi.1 +++ b/upstream/debian-bookworm/man1/mkosi.1 @@ -32,6 +32,8 @@ mkosi \[em] Build Bespoke OS Images .PP \f[V]mkosi [options\&...] qemu [qemu parameters\&...]\f[R] .PP +\f[V]mkosi [options\&...] vmspawn [vmspawn settings\&...]\f[R] +.PP \f[V]mkosi [options\&...] ssh [command line\&...]\f[R] .PP \f[V]mkosi [options\&...] journalctl [command line\&...]\f[R] @@ -103,6 +105,15 @@ For cpio images a kernel can also be provided by passing the Any arguments specified after the \f[V]qemu\f[R] verb are appended to the \f[V]qemu\f[R] invocation. .TP +\f[V]vmspawn\f[R] +Similar to \f[V]boot\f[R], but uses \f[V]systemd-vmspawn\f[R] to boot up +the image, i.e. +instead of container virtualization virtual machine virtualization is +used. +This verb is only supported for disk and directory type images. +Any arguments specified after the \f[V]vmspawn\f[R] verb are appended to +the \f[V]systemd-vmspawn\f[R] invocation. +.TP \f[V]ssh\f[R] When the image is built with the \f[V]Ssh=yes\f[R] option, this command connects to a booted virtual machine (\f[V]qemu\f[R]) via SSH. @@ -212,7 +223,7 @@ project located in a specific directory. \f[V]--debug=\f[R] Enable additional debugging output. .TP -\f[V]--debug-shell=\f[R] +\f[V]--debug-shell\f[R] When executing a command in the image fails, mkosi will start an interactive shell in the image allowing further debugging. .TP @@ -339,20 +350,21 @@ the CLI. .PP To conditionally include configuration files, the \f[V][Match]\f[R] section can be used. -Matches can use a pipe symbol (\f[V]|\f[R]) after the equals sign -(\f[V]\&...=|\&...\f[R]), which causes the match to become a triggering -match. +A \f[V][Match]\f[R] section consists of invididual conditions. +Conditions can use a pipe symbol (\f[V]|\f[R]) after the equals sign +(\f[V]\&...=|\&...\f[R]), which causes the condition to become a +triggering condition. The config file will be included if the logical AND of all -non-triggering matches and the logical OR of all triggering matches is -satisfied. -To negate the result of a match, prefix the argument with an exclamation -mark. +non-triggering conditions and the logical OR of all triggering +conditions is satisfied. +To negate the result of a condition, prefix the argument with an +exclamation mark. If an argument is prefixed with the pipe symbol and an exclamation mark, the pipe symbol must be passed first, and the exclamation second. .PP -Note that \f[V][Match]\f[R] settings match against the current values of -specific settings, and do not take into account changes made to the -setting in configuration files that have not been parsed yet. +Note that \f[V][Match]\f[R] conditions compare against the current +values of specific settings, and do not take into account changes made +to the setting in configuration files that have not been parsed yet. Also note that matching against a setting and then changing its value afterwards in a different config file may lead to unexpected results. .PP @@ -365,7 +377,7 @@ The \f[V][Match]\f[R] sections of files in \f[V]mkosi.conf.d/\f[R] and If there are multiple \f[V][Match]\f[R] sections in the same configuration file, each of them has to be satisfied in order for the configuration file to be included. -Specifically, triggering matches only apply to the current +Specifically, triggering conditions only apply to the current \f[V][Match]\f[R] section and are reset between multiple \f[V][Match]\f[R] sections. As an example, the following will only match if the output format is one @@ -384,6 +396,41 @@ Architecture=|arm64 \f[R] .fi .PP +The \f[V][TriggerMatch]\f[R] section can be used to indicate triggering +match sections. +These are identical to triggering conditions except they apply to the +entire match section instead of just a single condition. +As an example, the following will match if the distribution is +\f[V]debian\f[R] and the release is \f[V]bookworm\f[R] or if the +distribution is \f[V]ubuntu\f[R] and the release is \f[V]focal\f[R]. +.IP +.nf +\f[C] +[TriggerMatch] +Distribution=debian +Release=bookworm + +[TriggerMatch] +Distribution=ubuntu +Release=focal +\f[R] +.fi +.PP +The semantics of conditions in \f[V][TriggerMatch]\f[R] sections is the +same as in \f[V][Match]\f[R], i.e.\ all normal conditions are joined by +a logical AND and all triggering conditions are joined by a logical OR. +When mixing \f[V][Match]\f[R] and \f[V][TriggerMatch]\f[R] sections, a +match is achieved when all \f[V][Match]\f[R] sections match and at least +one \f[V][TriggerMatch]\f[R] section matches. +No match sections are valued as true. +Logically this means: +.IP +.nf +\f[C] +(\[u22C0]\[u1D62] Match\[u1D62]) \[AN] (\[u22C1]\[u1D62] TriggerMatch\[u1D62]) +\f[R] +.fi +.PP Command line options that take no argument are shown without \f[V]=\f[R] in their long version. In the config files, they should be specified with a boolean argument: @@ -616,6 +663,12 @@ which case the configuration is included after parsing all the other configuration files. Note that each path containing extra configuration is only parsed once, even if included more than once with \f[V]Include=\f[R]. +The builtin configs for the mkosi default initrd and default tools tree +can be included by including the literal value \f[V]mkosi-initrd\f[R] +and \f[V]mkosi-tools\f[R] respectively. +Note: Include names starting with either of the literals +\f[V]mkosi-\f[R] or \f[V]contrib-\f[R] are reserved for use by mkosi +itself. .TP \f[V]InitrdInclude=\f[R], \f[V]--initrd-include=\f[R] Same as \f[V]Include=\f[R], but the extra configuration files or @@ -789,10 +842,15 @@ This can be used to enable the EPEL repos for CentOS or different components of the Debian/Ubuntu repositories. .TP \f[V]CacheOnly=\f[R], \f[V]--cache-only=\f[R] -If specified, the package manager is instructed not to contact the -network for updating package data. +Takes one of \f[V]none\f[R], \f[V]metadata\f[R] or \f[V]always\f[R]. +If \f[V]always\f[R], the package manager is instructed not to contact +the network. This provides a minimal level of reproducibility, as long as the package cache is already fully populated. +If set to \f[V]metadata\f[R], the package manager can still download +packages, but we won\[cq]t sync the repository metadata. +If set to \f[V]none\f[R], the repository metadata is synced and packages +can be downloaded during the build. .TP \f[V]PackageManagerTrees=\f[R], \f[V]--package-manager-tree=\f[R] This option mirrors the above \f[V]SkeletonTrees=\f[R] option and @@ -870,6 +928,11 @@ verbs are not available when this option is used. Implied for \f[V]tar\f[R], \f[V]cpio\f[R], \f[V]uki\f[R], and \f[V]esp\f[R]. .TP +\f[V]CompressLevel=\f[R], \f[V]--compress-level=\f[R] +Configure the compression level to use. +Takes an integer. +The possible values depend on the compression being used. +.TP \f[V]OutputDirectory=\f[R], \f[V]--output-dir=\f[R], \f[V]-O\f[R] Path to a directory where to place all generated artifacts. If this is not specified and the directory \f[V]mkosi.output/\f[R] @@ -889,11 +952,18 @@ an \f[V]mkosi\f[R] invocation be aborted abnormally (for example, due to reboot/power failure). .TP \f[V]CacheDirectory=\f[R], \f[V]--cache-dir=\f[R] -Takes a path to a directory to use as package cache for the distribution -package manager used. +Takes a path to a directory to use as the incremental cache directory +for the incremental images produced when the \f[V]Incremental=\f[R] +option is enabled. If this option is not used, but a \f[V]mkosi.cache/\f[R] directory is found in the local directory it is automatically used for this purpose. .TP +\f[V]PackageCacheDirectory=\f[R], \f[V]--package-cache-dir\f[R] +Takes a path to a directory to use as the package cache directory for +the distribution package manager used. +If unset, a suitable directory in the user\[cq]s home directory or +system is used. +.TP \f[V]BuildDirectory=\f[R], \f[V]--build-dir=\f[R] Takes a path to a directory to use as the build directory for build systems that support out-of-tree builds (such as Meson). @@ -1123,8 +1193,8 @@ scratch. Only extra packages are installed on top of the ones already installed in the base trees. Note that for this to work properly, the base image still needs to -contain the package manager metadata (see -\f[V]CleanPackageMetadata=\f[R]). +contain the package manager metadata by setting +\f[V]CleanPackageMetadata=no\f[R] (see \f[V]CleanPackageMetadata=\f[R]). Instead of a directory, a tar file or a disk image may be provided. In this case it is unpacked into the OS tree. This mode of operation allows setting permissions and file ownership @@ -1185,13 +1255,18 @@ Takes a comma-separated list of globs. Files in the image matching the globs will be purged at the end. .TP \f[V]CleanPackageMetadata=\f[R], \f[V]--clean-package-metadata=\f[R] -Enable/disable removal of package manager databases at the end of -installation. +Enable/disable removal of package manager databases and repository +metadata at the end of installation. Can be specified as \f[V]true\f[R], \f[V]false\f[R], or \f[V]auto\f[R] (the default). -With \f[V]auto\f[R], files will be removed if the respective package -manager executable is \f[I]not\f[R] present at the end of the -installation. +With \f[V]auto\f[R], package manager databases and repository metadata +will be removed if the respective package manager executable is +\f[I]not\f[R] present at the end of the installation. +.TP +\f[V]SyncScripts=\f[R], \f[V]--sync-script=\f[R] +Takes a comma-separated list of paths to executables that are used as +the sync scripts for this image. +See the \f[B]Scripts\f[R] section for more information. .TP \f[V]PrepareScripts=\f[R], \f[V]--prepare-script=\f[R] Takes a comma-separated list of paths to executables that are used as @@ -1231,7 +1306,7 @@ Disabled by default. Configures whether changes to source directories (The working directory and configured using \f[V]BuildSources=\f[R]) are persisted. If enabled, all source directories will be reset to their original state -after scripts finish executing. +after scripts (except sync scripts) finish executing. .TP \f[V]Environment=\f[R], \f[V]--environment=\f[R] Adds variables to the environment that package managers and the @@ -1350,6 +1425,25 @@ binaries again. Note that this option only takes effect when an image that is bootable on UEFI firmware is requested using other options (\f[V]Bootable=\f[R], \f[V]Bootloader=\f[R]). +Note that when this option is enabled, mkosi will only install already +signed bootloader binaries, kernel image files and unified kernel images +as self-signed binaries would not be accepted by the signed version of +shim. +.TP +\f[V]UnifiedKernelImages=\f[R], \f[V]--unified-kernel-images=\f[R] +Specifies whether to use unified kernel images or not when +\f[V]Bootloader=\f[R] is set to \f[V]systemd-boot\f[R] or +\f[V]grub\f[R]. +Takes a boolean value or \f[V]auto\f[R]. +Defaults to \f[V]auto\f[R]. +If enabled, unified kernel images are always used and the build will +fail if any components required to build unified kernel images are +missing. +If set to \f[V]auto\f[R], unified kernel images will be used if all +necessary components are available. +Otherwise Type 1 entries as defined by the Boot Loader Specification +will be used instead. +If disabled, Type 1 entries will always be used. .TP \f[V]Initrds=\f[R], \f[V]--initrd\f[R] Use user-provided initrd(s). @@ -1365,8 +1459,16 @@ Takes a comma separated list of package specifications. This option may be used multiple times in which case the specified package lists are combined. .TP +\f[V]MicrocodeHost=\f[R], \f[V]--microcode-host=\f[R] +When set to true only include microcode for the host\[cq]s CPU in the +image. +.TP \f[V]KernelCommandLine=\f[R], \f[V]--kernel-command-line=\f[R] Use the specified kernel command line when building images. +Defaults to \f[V]console=ttyS0\f[R]. +For \f[V]arm\f[R], \f[V]s390\f[R] and \f[V]ppc\f[R], \f[V]ttyS0\f[R] is +replaced with \f[V]ttyAMA0\f[R], \f[V]ttysclp0\f[R] or \f[V]hvc0\f[R], +respectively. .TP \f[V]KernelModulesInclude=\f[R], \f[V]--kernel-modules-include=\f[R] Takes a list of regex patterns that specify kernel modules to include in @@ -1509,7 +1611,14 @@ Defaults to \f[V]yes\f[R]. .TP \f[V]SecureBootKey=\f[R], \f[V]--secure-boot-key=\f[R] Path to the PEM file containing the secret key for signing the UEFI -kernel image, if \f[V]SecureBoot=\f[R] is used. +kernel image if \f[V]SecureBoot=\f[R] is used and PCR signatures when +\f[V]SignExpectedPcr=\f[R] is also used. +When \f[V]SecureBootKeySource=\f[R] is specified, the input type depends +on the source. +.TP +\f[V]SecureBootKeySource=\f[R], \f[V]--secure-boot-key-source=\f[R] +Source of \f[V]SecureBootKey=\f[R], to support OpenSSL engines. +E.g.: \f[V]--secure-boot-key-source=engine:pkcs11\f[R] .TP \f[V]SecureBootCertificate=\f[R], \f[V]--secure-boot-certificate=\f[R] Path to the X.509 file containing the certificate for the signed UEFI @@ -1525,6 +1634,12 @@ with sbsign being preferred if both are installed. \f[V]VerityKey=\f[R], \f[V]--verity-key=\f[R] Path to the PEM file containing the secret key for signing the verity signature, if a verity signature partition is added with systemd-repart. +When \f[V]VerityKeySource=\f[R] is specified, the input type depends on +the source. +.TP +\f[V]VerityKeySource=\f[R], \f[V]--verity-key-source=\f[R] +Source of \f[V]VerityKey=\f[R], to support OpenSSL engines. +E.g.: \f[V]--verity-key-source=engine:pkcs11\f[R] .TP \f[V]VerityCertificate=\f[R], \f[V]--verity-certificate=\f[R] Path to the X.509 file containing the certificate for signing the verity @@ -1537,6 +1652,8 @@ kernel image. This option takes a boolean value or the special value \f[V]auto\f[R], which is the default, which is equal to a true value if the \f[V]systemd-measure\f[R] binary is in \f[V]PATH\f[R]. +Depends on \f[V]SecureBoot=\f[R] being enabled and key from +\f[V]SecureBootKey=\f[R]. .TP \f[V]Passphrase=\f[R], \f[V]--passphrase\f[R] Specify the path to a file containing the passphrase to use for LUKS @@ -1646,35 +1763,35 @@ Defaults to \f[V]no\f[R]. \f[V]QemuFirmware=\f[R], \f[V]--qemu-firmware=\f[R] When used with the \f[V]qemu\f[R] verb, this option specifies which firmware to use. -Takes one of \f[V]uefi\f[R], \f[V]bios\f[R], \f[V]linux\f[R], or -\f[V]auto\f[R]. +Takes one of \f[V]uefi\f[R], \f[V]uefi-secure-boot\f[R], \f[V]bios\f[R], +\f[V]linux\f[R], or \f[V]auto\f[R]. Defaults to \f[V]auto\f[R]. -When set to \f[V]uefi\f[R], the OVMF firmware is used. +When set to \f[V]uefi\f[R], the OVMF firmware without secure boot +support is used. +When set to \f[V]uefi-secure-boot\f[R], the OVMF firmware with secure +boot support is used. When set to \f[V]bios\f[R], the default SeaBIOS firmware is used. When set to \f[V]linux\f[R], direct kernel boot is used. See the \f[V]QemuKernel=\f[R] option for more details on which kernel image is used with direct kernel boot. -When set to \f[V]auto\f[R], \f[V]linux\f[R] is used if a cpio image is -being booted, \f[V]uefi\f[R] otherwise. +When set to \f[V]auto\f[R], \f[V]uefi-secure-boot\f[R] is used if +possible and \f[V]linux\f[R] otherwise. .TP \f[V]QemuFirmwareVariables=\f[R], \f[V]--qemu-firmware-variables=\f[R] When used with the \f[V]qemu\f[R] verb, this option specifies the path to the the firmware variables file to use. Currently, this option is only taken into account when the -\f[V]uefi\f[R] firmware is used. +\f[V]uefi\f[R] or \f[V]uefi-secure-boot\f[R] firmware is used. If not specified, mkosi will search for the default variables file and use that instead. +When set to \f[V]microsoft\f[R], a firmware variables file with the +Microsoft secure boot certificates already enrolled will be used. +When set to \f[V]custom\f[R], the secure boot certificate from +\f[V]SecureBootCertificate=\f[R] will be enrolled into the default +firmware variables file. \f[V]virt-fw-vars\f[R] from the virt-firmware (https://gitlab.com/kraxel/virt-firmware) project can be used to customize OVMF variable files. -Some distributions also provide variable files which already have -Microsoft\[cq]s certificates for secure boot enrolled. -For Fedora and Debian these are \f[V]OVMF_VARS.secboot.fd\f[R] and -\f[V]OVMF_VARS_4M.ms.fd\f[R] under \f[V]/usr/share/OVMF\f[R] -respectively. -You can use \f[V]locate\f[R] and look under -\f[V]/usr/share/qemu/firmware\f[R] for hints on where to find these -files if your distribution ships them. .TP \f[V]QemuKernel=\f[R], \f[V]--qemu-kernel=\f[R] Set the kernel image to use for qemu direct kernel boot. @@ -1701,7 +1818,18 @@ respectively. \f[V]directory\f[R] optionally specifies the directory in which to create the file backing the drive. \f[V]options\f[R] optionally specifies extra comma-delimited properties -which are passed verbatime to qemu\[cq]s \f[V]-drive\f[R] option. +which are passed verbatim to qemu\[cq]s \f[V]-drive\f[R] option. +Example usage: +.IP +.nf +\f[C] +[Host] +QemuDrives=btrfs:10G + ext4:20G +QemuArgs=-device nvme,serial=btrfs,drive=btrfs + -device nvme,serial=ext4,drive=ext4 +\f[R] +.fi .TP \f[V]QemuArgs=\f[R] Space-delimited list of additional arguments to pass when invoking qemu. @@ -1736,8 +1864,8 @@ directories that allow the user running mkosi to remove them without needing privileges. .TP \f[V]ToolsTree=\f[R], \f[V]--tools-tree=\f[R] -If specified, programs executed by mkosi are looked up inside the given -tree instead of in the host system. +If specified, programs executed by mkosi to build and boot an image are +looked up inside the given tree instead of in the host system. Use this option to make image builds more reproducible by always using the same versions of programs to build the final image instead of whatever version is installed on the host system. @@ -1773,6 +1901,21 @@ openSUSE T} _ T{ +\f[V]acl\f[R] +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T} +T{ \f[V]apt\f[R] T}@T{ X @@ -1800,6 +1943,21 @@ X T}@T{ T} T{ +\f[V]attr\f[R] +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T} +T{ \f[V]bash\f[R] T}@T{ X @@ -2051,6 +2209,66 @@ T}@T{ X T} T{ +\f[V]findutils\f[R] +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T} +T{ +\f[V]git\f[R] +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T} +T{ +\f[V]grep\f[R] +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T} +T{ +\f[V]jq\f[R] +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T} +T{ \f[V]kmod\f[R] T}@T{ X @@ -2141,6 +2359,21 @@ T}@T{ X T} T{ +\f[V]sed\f[R] +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T} +T{ \f[V]pacman\f[R] T}@T{ X @@ -2358,6 +2591,18 @@ T}@T{ X T} T{ +\f[V]virt-firmware\f[R] +T}@T{ +X +T}@T{ +X +T}@T{ +T}@T{ +T}@T{ +X +T}@T{ +T} +T{ \f[V]xfsprogs\f[R] T}@T{ X @@ -2432,6 +2677,12 @@ is used. Set the mirror to use for the default tools tree. By default, the default mirror for the tools tree distribution is used. .TP +\f[V]ToolsTreeRepositories=\f[R], \f[V]--tools-tree-repository\f[R] +Same as \f[V]Repositories=\f[R] but for the default tools tree. +.TP +\f[V]ToolsTreePackageManagerTrees=\f[R], \f[V]--tools-tree-package-manager-tree=\f[R] +Same as \f[V]PackageManagerTrees=\f[R] but for the default tools tree. +.TP \f[V]ToolsTreePackages=\f[R], \f[V]--tools-tree-packages=\f[R] Extra packages to install into the default tools tree. Takes a comma separated list of package specifications. @@ -2473,6 +2724,22 @@ If enabled, practically unlimited scratch space is made available under Note that using this feature with \f[V]mkosi qemu\f[R] requires systemd v254 or newer in the guest. .TP +\f[V]RuntimeNetwork=\f[R]: \f[V]--runtime-network=\f[R] +Takes one of \f[V]user\f[R], \f[V]interface\f[R] or \f[V]none\f[R]. +Defaults to \f[V]user\f[R]. +Specifies the networking to set up when booting the image. +\f[V]user\f[R] sets up usermode networking. +\f[V]interface\f[R] sets up a virtual network connection between the +host and the image. +This translates to a veth interface for \f[V]mkosi shell\f[R] and +\f[V]mkosi boot\f[R] and a tap interface for \f[V]mkosi qemu\f[R] and +\f[V]mkosi vmspawn\f[R]. +Note that when using \f[V]interface\f[R], mkosi does not automatically +configure the host interface. +It is expected that a recent version of \f[V]systemd-networkd\f[R] is +running on the host which will automatically configure the host +interface of the link. +.TP \f[V]SshKey=\f[R], \f[V]--ssh-key=\f[R] Path to the X509 private key in PEM format to use to connect to a virtual machine started with \f[V]mkosi qemu\f[R] and built with the @@ -2576,10 +2843,6 @@ distributions: .IP \[bu] 2 \f[I]Alma Linux\f[R] .IP \[bu] 2 -\f[I]Gentoo\f[R] (\f[B]Gentoo is experimental and unsupported. -We make no guarantee that it will work at all and the core maintainers -will generally not fix gentoo specific issues\f[R]) -.IP \[bu] 2 \f[I]None\f[R] (\f[B]Requires the user to provide a pre-built rootfs\f[R]) .PP @@ -2648,61 +2911,67 @@ Then, for each image, we execute the following steps: .IP " 1." 4 Copy package manager trees into the workspace .IP " 2." 4 -Copy base trees (\f[V]--base-tree=\f[R]) into the image +Sync the package manager repository metadata .IP " 3." 4 -Copy skeleton trees (\f[V]mkosi.skeleton\f[R]) into image +Copy base trees (\f[V]--base-tree=\f[R]) into the image .IP " 4." 4 -Install distribution and packages into image or use cache tree if -available +Reuse a cached image if one is available .IP " 5." 4 +Copy a snapshot of the package manager repository metadata into the +image +.IP " 6." 4 +Copy skeleton trees (\f[V]mkosi.skeleton\f[R]) into image +.IP " 7." 4 +Install distribution and packages into image +.IP " 8." 4 Run prepare scripts on image with the \f[V]final\f[R] argument (\f[V]mkosi.prepare\f[R]) -.IP " 6." 4 +.IP " 9." 4 Install build packages in overlay if any build scripts are configured -.IP " 7." 4 +.IP "10." 4 Run prepare scripts on overlay with the \f[V]build\f[R] argument if any build scripts are configured (\f[V]mkosi.prepare\f[R]) -.IP " 8." 4 +.IP "11." 4 Cache the image if configured (\f[V]--incremental\f[R]) -.IP " 9." 4 +.IP "12." 4 Run build scripts on image + overlay if any build scripts are configured (\f[V]mkosi.build\f[R]) -.IP "10." 4 +.IP "13." 4 Finalize the build if the output format \f[V]none\f[R] is configured -.IP "11." 4 +.IP "14." 4 Copy the build scripts outputs into the image -.IP "12." 4 +.IP "15." 4 Copy the extra trees into the image (\f[V]mkosi.extra\f[R]) -.IP "13." 4 +.IP "16." 4 Run post-install scripts (\f[V]mkosi.postinst\f[R]) -.IP "14." 4 +.IP "17." 4 Write config files required for \f[V]Ssh=\f[R], \f[V]Autologin=\f[R] and \f[V]MakeInitrd=\f[R] -.IP "15." 4 +.IP "18." 4 Install systemd-boot and configure secure boot if configured (\f[V]--secure-boot\f[R]) -.IP "16." 4 +.IP "19." 4 Run \f[V]systemd-sysusers\f[R] -.IP "17." 4 +.IP "20." 4 Run \f[V]systemd-tmpfiles\f[R] -.IP "18." 4 +.IP "21." 4 Run \f[V]systemctl preset-all\f[R] -.IP "19." 4 +.IP "22." 4 Run \f[V]depmod\f[R] -.IP "20." 4 +.IP "23." 4 Run \f[V]systemd-firstboot\f[R] -.IP "21." 4 +.IP "24." 4 Run \f[V]systemd-hwdb\f[R] -.IP "22." 4 +.IP "25." 4 Remove packages and files (\f[V]RemovePackages=\f[R], \f[V]RemoveFiles=\f[R]) -.IP "23." 4 +.IP "26." 4 Run SELinux relabel is a SELinux policy is installed -.IP "24." 4 +.IP "27." 4 Run finalize scripts (\f[V]mkosi.finalize\f[R]) -.IP "25." 4 +.IP "28." 4 Generate unified kernel image if configured to do so -.IP "26." 4 +.IP "29." 4 Generate final output format .SH Scripts .PP @@ -2720,6 +2989,16 @@ in the current working directory. \f[V]$SRCDIR\f[R] is set to point to the current working directory. The following scripts are supported: .IP \[bu] 2 +If \f[B]\f[VB]mkosi.sync\f[B]\f[R] (\f[V]SyncScripts=\f[R]) exists, it +is executed before the image is built. +This script may be used to update various sources that are used to build +the image. +One use case is to run \f[V]git pull\f[R] on various source repositories +before building the image. +Specifically, the \f[V]BuildSourcesEphemeral=\f[R] setting does not +apply to sync scripts, which means sync scripts can be used to update +build sources even if \f[V]BuildSourcesEphemeral=\f[R] is enabled. +.IP \[bu] 2 If \f[B]\f[VB]mkosi.prepare\f[B]\f[R] (\f[V]PrepareScripts=\f[R]) exists, it is first called with the \f[V]final\f[R] argument, right after the software packages are installed. @@ -2774,6 +3053,18 @@ architecture of the host machine. See the documentation of \f[V]Architecture=\f[R] for possible values for this variable. .IP \[bu] 2 +\f[V]$DISTRIBUTION\f[R] contains the distribution from the +\f[V]Distribution=\f[R] setting. +.IP \[bu] 2 +\f[V]$RELEASE\f[R] contains the release from the \f[V]Release=\f[R] +setting. +.IP \[bu] 2 +\f[V]$PROFILE\f[R] contains the profile from the \f[V]Profile=\f[R] +setting. +.IP \[bu] 2 +\f[V]$CACHED=\f[R] is set to \f[V]1\f[R] if a cached image is available, +\f[V]0\f[R] otherwise. +.IP \[bu] 2 \f[V]$CHROOT_SCRIPT\f[R] contains the path to the running script relative to the image root directory. The primary usecase for this variable is in combination with the @@ -2847,16 +3138,23 @@ in the user namespace that mkosi is running in. These can be used in combination with \f[V]setpriv\f[R] to run commands as the user that invoked mkosi (e.g. \f[V]setpriv --reuid=$MKOSI_UID --regid=$MKOSI_GID --clear-groups <command>\f[R]) +.IP \[bu] 2 +\f[V]$MKOSI_CONFIG\f[R] is a file containing a json summary of the +settings of the current image. +This file can be parsed inside scripts to gain access to all settings +for the current image. .PP Consult this table for which script receives which environment variables: .PP .TS tab(@); -lw(16.5n) lw(13.4n) lw(11.8n) lw(14.2n) lw(14.2n). +lw(14.3n) lw(9.5n) lw(11.6n) lw(10.2n) lw(12.2n) lw(12.2n). T{ Variable T}@T{ +\f[V]mkosi.sync\f[R] +T}@T{ \f[V]mkosi.prepare\f[R] T}@T{ \f[V]mkosi.build\f[R] @@ -2867,7 +3165,22 @@ T}@T{ T} _ T{ -\f[V]$CHROOT_SCRIPT\f[R] +\f[V]ARCHITECTURE\f[R] +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T} +T{ +\f[V]DISTRIBUTION\f[R] +T}@T{ +X T}@T{ X T}@T{ @@ -2878,7 +3191,56 @@ T}@T{ X T} T{ -\f[V]$SRCDIR\f[R] +\f[V]RELEASE\f[R] +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T} +T{ +\f[V]PROFILE\f[R] +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T} +T{ +\f[V]CACHED\f[R] +T}@T{ +X +T}@T{ +T}@T{ +T}@T{ +T}@T{ +T} +T{ +\f[V]CHROOT_SCRIPT\f[R] +T}@T{ +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T} +T{ +\f[V]SRCDIR\f[R] +T}@T{ +X T}@T{ X T}@T{ @@ -2891,6 +3253,7 @@ T} T{ \f[V]CHROOT_SRCDIR\f[R] T}@T{ +T}@T{ X T}@T{ X @@ -2900,7 +3263,8 @@ T}@T{ X T} T{ -\f[V]$BUILDDIR\f[R] +\f[V]BUILDDIR\f[R] +T}@T{ T}@T{ T}@T{ X @@ -2911,6 +3275,7 @@ T{ \f[V]CHROOT_BUILDDIR\f[R] T}@T{ T}@T{ +T}@T{ X T}@T{ T}@T{ @@ -2919,6 +3284,7 @@ T{ \f[V]DESTDIR\f[R] T}@T{ T}@T{ +T}@T{ X T}@T{ T}@T{ @@ -2927,12 +3293,14 @@ T{ \f[V]CHROOT_DESTDIR\f[R] T}@T{ T}@T{ +T}@T{ X T}@T{ T}@T{ T} T{ -\f[V]$OUTPUTDIR\f[R] +\f[V]OUTPUTDIR\f[R] +T}@T{ T}@T{ T}@T{ X @@ -2945,6 +3313,7 @@ T{ \f[V]CHROOT_OUTPUTDIR\f[R] T}@T{ T}@T{ +T}@T{ X T}@T{ X @@ -2952,7 +3321,8 @@ T}@T{ X T} T{ -\f[V]$BUILDROOT\f[R] +\f[V]BUILDROOT\f[R] +T}@T{ T}@T{ X T}@T{ @@ -2965,6 +3335,7 @@ T} T{ \f[V]WITH_DOCS\f[R] T}@T{ +T}@T{ X T}@T{ X @@ -2974,6 +3345,7 @@ T} T{ \f[V]WITH_TESTS\f[R] T}@T{ +T}@T{ X T}@T{ X @@ -2983,6 +3355,7 @@ T} T{ \f[V]WITH_NETWORK\f[R] T}@T{ +T}@T{ X T}@T{ X @@ -2992,6 +3365,7 @@ T} T{ \f[V]SOURCE_DATE_EPOCH\f[R] T}@T{ +T}@T{ X T}@T{ X @@ -3010,6 +3384,8 @@ T}@T{ X T}@T{ X +T}@T{ +X T} T{ \f[V]MKOSI_GID\f[R] @@ -3021,6 +3397,21 @@ T}@T{ X T}@T{ X +T}@T{ +X +T} +T{ +\f[V]MKOSI_CONFIG\f[R] +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X +T}@T{ +X T} .TE .PP @@ -3064,6 +3455,13 @@ these commands operate on the image\[cq]s root directory with the configuration supplied by the user instead of on the host system. This means that from a script, you can do e.g.\ \f[V]dnf install vim\f[R] to install vim into the image. +.RS 2 +.PP +Additionally, \f[V]mkosi-install\f[R], \f[V]mkosi-reinstall\f[R], +\f[V]mkosi-upgrade\f[R] and \f[V]mkosi-remove\f[R] will invoke the +corresponding operation of the package manager being used to built the +image. +.RE .IP \[bu] 2 \f[V]mkosi-as-caller\f[R]: This script uses \f[V]setpriv\f[R] to switch from the user \f[V]root\f[R] in the user namespace used for various @@ -3527,6 +3925,7 @@ Note that the minimum required Python version is 3.9. .SH Frequently Asked Questions (FAQ) .IP \[bu] 2 Why does \f[V]mkosi qemu\f[R] with KVM not work on Debian/Ubuntu? +.RS 2 .PP While other distributions are OK with allowing access to \f[V]/dev/kvm\f[R], on Debian/Ubuntu this is only allowed for users in @@ -3542,6 +3941,23 @@ To persist these settings across reboots, copy \f[V]/usr/lib/tmpfiles.d/static-nodes-permissions.conf\f[R] to \f[V]/etc/tmpfiles.d/static-nodes-permissions.conf\f[R] and change the mode of \f[V]/dev/kvm\f[R] from \f[V]0660\f[R] to \f[V]0666\f[R]. +.RE +.IP \[bu] 2 +How do I add a regular user to an image? +.RS 2 +.PP +You can use the following snippet in a post-installation script: +.IP +.nf +\f[C] +useradd --create-home --user-group $USER --password \[dq]$(openssl passwd -stdin -6 <$USER_PASSWORD_FILE)\[dq] +\f[R] +.fi +.PP +Note that from systemd v256 onwards, if enabled, +\f[V]systemd-homed-firstboot.service\f[R] will prompt to create a +regular user on first boot if there are no regular users. +.RE .SH REFERENCES .IP \[bu] 2 Primary mkosi git repository on diff --git a/upstream/debian-bookworm/man1/nmblookup.1 b/upstream/debian-bookworm/man1/nmblookup.1 index 4155a41f..d0adc3e5 100644 --- a/upstream/debian-bookworm/man1/nmblookup.1 +++ b/upstream/debian-bookworm/man1/nmblookup.1 @@ -2,12 +2,12 @@ .\" Title: nmblookup .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 02/05/2024 +.\" Date: 05/08/2024 .\" Manual: User Commands -.\" Source: Samba 4.19.4-Debian +.\" Source: Samba 4.19.6-Debian .\" Language: English .\" -.TH "NMBLOOKUP" "1" "02/05/2024" "Samba 4\&.19\&.4\-Debian" "User Commands" +.TH "NMBLOOKUP" "1" "05/08/2024" "Samba 4\&.19\&.6\-Debian" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -330,7 +330,7 @@ nmblookup \-U samba\&.org \-R \*(AqIRIX#1B\*(Aq would query the WINS server samba\&.org for the domain master browser (1B name type) for the IRIX workgroup\&. .SH "VERSION" .PP -This man page is part of version 4\&.19\&.4\-Debian of the Samba suite\&. +This man page is part of version 4\&.19\&.6\-Debian of the Samba suite\&. .SH "SEE ALSO" .PP \fBnmbd\fR(8), diff --git a/upstream/debian-bookworm/man1/samba-log-parser.1 b/upstream/debian-bookworm/man1/samba-log-parser.1 index 9cdce495..a6f9a59b 100644 --- a/upstream/debian-bookworm/man1/samba-log-parser.1 +++ b/upstream/debian-bookworm/man1/samba-log-parser.1 @@ -2,12 +2,12 @@ .\" Title: samba-log-parser .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 02/05/2024 +.\" Date: 05/08/2024 .\" Manual: User Commands -.\" Source: Samba 4.19.4-Debian +.\" Source: Samba 4.19.6-Debian .\" Language: English .\" -.TH "SAMBA\-LOG\-PARSER" "1" "02/05/2024" "Samba 4\&.19\&.4\-Debian" "User Commands" +.TH "SAMBA\-LOG\-PARSER" "1" "05/08/2024" "Samba 4\&.19\&.6\-Debian" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -144,7 +144,7 @@ Sort traces using the timestamp for log files found in the samba log directory\& .\} .SH "VERSION" .PP -This man page is part of version 4\&.19\&.4\-Debian of the Samba suite\&. +This man page is part of version 4\&.19\&.6\-Debian of the Samba suite\&. .SH "AUTHOR" .PP The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&. diff --git a/upstream/debian-bookworm/man1/testparm.1 b/upstream/debian-bookworm/man1/testparm.1 index 7e30cd43..c995acbd 100644 --- a/upstream/debian-bookworm/man1/testparm.1 +++ b/upstream/debian-bookworm/man1/testparm.1 @@ -2,12 +2,12 @@ .\" Title: testparm .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 02/05/2024 +.\" Date: 05/08/2024 .\" Manual: User Commands -.\" Source: Samba 4.19.4-Debian +.\" Source: Samba 4.19.6-Debian .\" Language: English .\" -.TH "TESTPARM" "1" "02/05/2024" "Samba 4\&.19\&.4\-Debian" "User Commands" +.TH "TESTPARM" "1" "05/08/2024" "Samba 4\&.19\&.6\-Debian" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -184,7 +184,7 @@ The program will issue a message saying whether the configuration file loaded OK For certain use cases, SMB protocol requires use of cryptographic algorithms which are known to be weak and already broken\&. DES and ARCFOUR (RC4) ciphers and the SHA1 and MD5 hash algorithms are considered weak but they are required for backward compatibility\&. The testparm utility shows whether the Samba tools will fall back to these weak crypto algorithms if it is not possible to use strong cryptography by default\&. In FIPS mode weak crypto cannot be enabled\&. .SH "VERSION" .PP -This man page is part of version 4\&.19\&.4\-Debian of the Samba suite\&. +This man page is part of version 4\&.19\&.6\-Debian of the Samba suite\&. .SH "SEE ALSO" .PP \fBsmb.conf\fR(5), diff --git a/upstream/debian-bookworm/man5/e2fsck.conf.5 b/upstream/debian-bookworm/man5/e2fsck.conf.5 index ad91762c..df20d9c4 100644 --- a/upstream/debian-bookworm/man5/e2fsck.conf.5 +++ b/upstream/debian-bookworm/man5/e2fsck.conf.5 @@ -2,7 +2,7 @@ .\" Copyright 2006 by Theodore Ts'o. All Rights Reserved. .\" This file may be copied under the terms of the GNU Public License. .\" -.TH e2fsck.conf 5 "February 2023" "E2fsprogs version 1.47.0" +.TH e2fsck.conf 5 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME e2fsck.conf \- Configuration file for e2fsck .SH DESCRIPTION diff --git a/upstream/debian-bookworm/man5/ext4.5 b/upstream/debian-bookworm/man5/ext4.5 index 5be4c1d1..390aa8e0 100644 --- a/upstream/debian-bookworm/man5/ext4.5 +++ b/upstream/debian-bookworm/man5/ext4.5 @@ -2,7 +2,7 @@ .\" Copyright 1993, 1994, 1995 by Theodore Ts'o. All Rights Reserved. .\" This file may be copied under the terms of the GNU Public License. .\" -.TH EXT4 5 "February 2023" "E2fsprogs version 1.47.0" +.TH EXT4 5 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME ext2 \- the second extended file system .br diff --git a/upstream/debian-bookworm/man5/lmhosts.5 b/upstream/debian-bookworm/man5/lmhosts.5 index 01b0b68f..dbaa158b 100644 --- a/upstream/debian-bookworm/man5/lmhosts.5 +++ b/upstream/debian-bookworm/man5/lmhosts.5 @@ -2,12 +2,12 @@ .\" Title: lmhosts .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 02/05/2024 +.\" Date: 05/08/2024 .\" Manual: File Formats and Conventions -.\" Source: Samba 4.19.4-Debian +.\" Source: Samba 4.19.6-Debian .\" Language: English .\" -.TH "LMHOSTS" "5" "02/05/2024" "Samba 4\&.19\&.4\-Debian" "File Formats and Conventions" +.TH "LMHOSTS" "5" "05/08/2024" "Samba 4\&.19\&.6\-Debian" "File Formats and Conventions" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -112,7 +112,7 @@ or /usr/local/samba/lib\&. .SH "VERSION" .PP -This man page is part of version 4\&.19\&.4\-Debian of the Samba suite\&. +This man page is part of version 4\&.19\&.6\-Debian of the Samba suite\&. .SH "SEE ALSO" .PP \fBsmbclient\fR(1), diff --git a/upstream/debian-bookworm/man5/mke2fs.conf.5 b/upstream/debian-bookworm/man5/mke2fs.conf.5 index 04a1aca1..5b0760ec 100644 --- a/upstream/debian-bookworm/man5/mke2fs.conf.5 +++ b/upstream/debian-bookworm/man5/mke2fs.conf.5 @@ -2,7 +2,7 @@ .\" Copyright 2006 by Theodore Ts'o. All Rights Reserved. .\" This file may be copied under the terms of the GNU Public License. .\" -.TH mke2fs.conf 5 "February 2023" "E2fsprogs version 1.47.0" +.TH mke2fs.conf 5 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME mke2fs.conf \- Configuration file for mke2fs .SH DESCRIPTION diff --git a/upstream/debian-bookworm/man5/smb.conf.5 b/upstream/debian-bookworm/man5/smb.conf.5 index bf682341..665e6c1d 100644 --- a/upstream/debian-bookworm/man5/smb.conf.5 +++ b/upstream/debian-bookworm/man5/smb.conf.5 @@ -2,12 +2,12 @@ .\" Title: smb.conf .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 02/05/2024 +.\" Date: 05/08/2024 .\" Manual: File Formats and Conventions -.\" Source: Samba 4.19.4-Debian +.\" Source: Samba 4.19.6-Debian .\" Language: English .\" -.TH "SMB\&.CONF" "5" "02/05/2024" "Samba 4\&.19\&.4\-Debian" "File Formats and Conventions" +.TH "SMB\&.CONF" "5" "05/08/2024" "Samba 4\&.19\&.6\-Debian" "File Formats and Conventions" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -14622,7 +14622,7 @@ and special sections make life for an administrator easy, but the various combinations of default attributes can be tricky\&. Take extreme care when designing these sections\&. In particular, ensure that the permissions on spool directories are correct\&. .SH "VERSION" .PP -This man page is part of version 4\&.19\&.4\-Debian of the Samba suite\&. +This man page is part of version 4\&.19\&.6\-Debian of the Samba suite\&. .SH "SEE ALSO" .PP \fBsamba\fR(7), diff --git a/upstream/debian-bookworm/man5/smbpasswd.5 b/upstream/debian-bookworm/man5/smbpasswd.5 index 11b50bbf..f2d0c6f2 100644 --- a/upstream/debian-bookworm/man5/smbpasswd.5 +++ b/upstream/debian-bookworm/man5/smbpasswd.5 @@ -2,12 +2,12 @@ .\" Title: smbpasswd .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 02/05/2024 +.\" Date: 05/08/2024 .\" Manual: File Formats and Conventions -.\" Source: Samba 4.19.4-Debian +.\" Source: Samba 4.19.6-Debian .\" Language: English .\" -.TH "SMBPASSWD" "5" "02/05/2024" "Samba 4\&.19\&.4\-Debian" "File Formats and Conventions" +.TH "SMBPASSWD" "5" "05/08/2024" "Samba 4\&.19\&.6\-Debian" "File Formats and Conventions" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -165,7 +165,7 @@ This field consists of the time the account was last modified\&. It consists of All other colon separated fields are ignored at this time\&. .SH "VERSION" .PP -This man page is part of version 4\&.19\&.4\-Debian of the Samba suite\&. +This man page is part of version 4\&.19\&.6\-Debian of the Samba suite\&. .SH "SEE ALSO" .PP \fBsmbpasswd\fR(8), diff --git a/upstream/debian-bookworm/man7/samba.7 b/upstream/debian-bookworm/man7/samba.7 index e58b60e4..adeb798b 100644 --- a/upstream/debian-bookworm/man7/samba.7 +++ b/upstream/debian-bookworm/man7/samba.7 @@ -2,12 +2,12 @@ .\" Title: samba .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 02/05/2024 +.\" Date: 05/08/2024 .\" Manual: Miscellanea -.\" Source: Samba 4.19.4-Debian +.\" Source: Samba 4.19.6-Debian .\" Language: English .\" -.TH "SAMBA" "7" "02/05/2024" "Samba 4\&.19\&.4\-Debian" "Miscellanea" +.TH "SAMBA" "7" "05/08/2024" "Samba 4\&.19\&.6\-Debian" "Miscellanea" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -231,7 +231,7 @@ https://lists\&.samba\&.org you can find a lot of information in the archives and you can subscribe to the samba list and ask for help or discuss things\&. .SH "VERSION" .PP -This man page is part of version 4\&.19\&.4\-Debian of the Samba suite\&. +This man page is part of version 4\&.19\&.6\-Debian of the Samba suite\&. .SH "CONTRIBUTIONS" .PP If you wish to contribute to the Samba project, then I suggest you join the Samba mailing list at diff --git a/upstream/debian-bookworm/man8/badblocks.8 b/upstream/debian-bookworm/man8/badblocks.8 index 0b0d8644..3e7074fc 100644 --- a/upstream/debian-bookworm/man8/badblocks.8 +++ b/upstream/debian-bookworm/man8/badblocks.8 @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH BADBLOCKS 8 "February 2023" "E2fsprogs version 1.47.0" +.TH BADBLOCKS 8 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME badblocks \- search a device for bad blocks .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man8/bridge.8 b/upstream/debian-bookworm/man8/bridge.8 index a60964bb..bb02bd27 100644 --- a/upstream/debian-bookworm/man8/bridge.8 +++ b/upstream/debian-bookworm/man8/bridge.8 @@ -22,6 +22,7 @@ bridge \- show / manipulate bridge addresses and devices \fB\-s\fR[\fItatistics\fR] | \fB\-n\fR[\fIetns\fR] name | \fB\-b\fR[\fIatch\fR] filename | +\fB\-com\fR[\fIpressvlans\fR] | \fB\-c\fR[\fIolor\fR] | \fB\-p\fR[\fIretty\fR] | \fB\-j\fR[\fIson\fR] | @@ -188,6 +189,25 @@ bridge \- show / manipulate bridge addresses and devices .IR SRC_VNI " ]" .ti -8 +.B "bridge mdb flush" +.BI dev " DEV " +.RB "[ " port +.IR PORT " ]" +.RB "[ " vid +.IR VID " ]" +.RB "[ " src_vni +.IR SRC_VNI " ]" +.RB "[ " proto +.IR PROTO " ]" +.RB "[ " [no]permanent " ]" +.RB "[ " dst +.IR IPADDR " ]" +.RB "[ " dst_port +.IR DST_PORT " ]" +.RB "[ " vni +.IR VNI " ]" + +.ti -8 .BR "bridge vlan" " { " add " | " del " } " .B dev .I DEV @@ -327,6 +347,11 @@ If there were any errors during execution of the commands, the application return code will be non zero. .TP +.BR "\-com", " \-compressvlans" +Show compressed VLAN list. It will show continuous VLANs with the range instead +of separated VLANs. Default is off. + +.TP .BR \-c [ color ][ = { always | auto | never } Configure color output. If parameter is omitted or .BR always , @@ -1172,6 +1197,54 @@ the VLAN ID. Only relevant when the bridge is VLAN-aware. the source VNI Network Identifier. Only relevant when the VXLAN device is in external mode. +.SS bridge mdb flush - flush multicast group database entries. + +This command flushes the matching multicast group database entries. + +.TP +.BI dev " DEV" +the interface where this group address is associated. + +.TP +.BI port " PORT" +the target port for the operation. If the bridge device is specified then only +entries pointing to the bridge itself will be deleted. + +.TP +.BI vid " VID" +the VLAN ID for the operation. Match entries only with the specified VLAN ID. + +.TP +.BI src_vni " SRC_VNI" +the source VNI Network Identifier for the operation. Match entries only with +the specified source VNI. + +.TP +.BI proto " PROTO" +the routing protocol identifier for the operation. Match entries only with the +specified routing protocol. Can be a number or a string from the file +/etc/iproute2/rt_protos. + +.TP +.B [no]permanent +if specified then only permanent entries will be deleted or respectively if +"no" is prepended then only non-permanent (temp) entries will be deleted. + +.TP +.BI dst " IPADDR" +the IP address of the destination VXLAN tunnel endpoint where the multicast +receivers reside. Match entries only with the specified destination IP. + +.TP +.BI dst_port " DST_PORT" +the UDP destination port number to use to connect to the remote VXLAN tunnel +endpoint. Match entries only with the specified destination port number. + +.TP +.BI vni " VNI" +the VXLAN VNI Network Identifier to use to connect to the remote VXLAN tunnel +endpoint. Match entries only with the specified destination VNI. + .SH bridge vlan - VLAN filter list .B vlan diff --git a/upstream/debian-bookworm/man8/debugfs.8 b/upstream/debian-bookworm/man8/debugfs.8 index 8b6a600d..746c5327 100644 --- a/upstream/debian-bookworm/man8/debugfs.8 +++ b/upstream/debian-bookworm/man8/debugfs.8 @@ -2,7 +2,7 @@ .\" Copyright 1993, 1994, 1995 by Theodore Ts'o. All Rights Reserved. .\" This file may be copied under the terms of the GNU Public License. .\" -.TH DEBUGFS 8 "February 2023" "E2fsprogs version 1.47.0" +.TH DEBUGFS 8 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME debugfs \- ext2/ext3/ext4 file system debugger .SH SYNOPSIS @@ -268,9 +268,24 @@ number, otherwise use the .B s_mmp_block field in the superblock to locate and use the existing MMP block. .TP -.BI dx_hash " [-h hash_alg] [-s hash_seed] filename" +.BI dx_hash " [-cv] [-h hash_alg] [-s hash_seed] filename" Calculate the directory hash of .IR filename . +The +.I -c +option will casefold the filename before calculating the hash. The +.I -v +option will make the +.B dx_hash +command more verbose and print the hash algorithm and hash seed to +calculate the hash. +If a file system is open, use the hash_seed and +default hash_algorithm used by the file system, although these can be +overridden by the +.I -h +and +.I -s +options. The hash algorithm specified with .I -h may be diff --git a/upstream/debian-bookworm/man8/devlink-rate.8 b/upstream/debian-bookworm/man8/devlink-rate.8 index bcec3c31..f09ac4ac 100644 --- a/upstream/debian-bookworm/man8/devlink-rate.8 +++ b/upstream/debian-bookworm/man8/devlink-rate.8 @@ -149,7 +149,7 @@ These parameter accept integer meaning weight or priority of a node. - set rate object parent to existing node with name \fINODE_NAME\fR or unset parent. Rate limits of the parent node applied to all it's children. Actual behaviour is details of driver's implementation. Setting parent to empty ("") -name due to the kernel logic threated as parent unset. +name due to the kernel logic treated as parent unset. .SS devlink port function rate add - create node rate object with specified parameters. Creates rate object of type node and sets parameters. Parameters same as for the diff --git a/upstream/debian-bookworm/man8/dumpe2fs.8 b/upstream/debian-bookworm/man8/dumpe2fs.8 index e1b15c0c..7dfc94fa 100644 --- a/upstream/debian-bookworm/man8/dumpe2fs.8 +++ b/upstream/debian-bookworm/man8/dumpe2fs.8 @@ -2,7 +2,7 @@ .\" Copyright 1993, 1994, 1995 by Theodore Ts'o. All Rights Reserved. .\" This file may be copied under the terms of the GNU Public License. .\" -.TH DUMPE2FS 8 "February 2023" "E2fsprogs version 1.47.0" +.TH DUMPE2FS 8 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME dumpe2fs \- dump ext2/ext3/ext4 file system information .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man8/e2freefrag.8 b/upstream/debian-bookworm/man8/e2freefrag.8 index 510cbb32..d4a227af 100644 --- a/upstream/debian-bookworm/man8/e2freefrag.8 +++ b/upstream/debian-bookworm/man8/e2freefrag.8 @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH E2FREEFRAG 8 "February 2023" "E2fsprogs version 1.47.0" +.TH E2FREEFRAG 8 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME e2freefrag \- report free space fragmentation information .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man8/e2fsck.8 b/upstream/debian-bookworm/man8/e2fsck.8 index 68b867cf..9a4dc3cf 100644 --- a/upstream/debian-bookworm/man8/e2fsck.8 +++ b/upstream/debian-bookworm/man8/e2fsck.8 @@ -2,7 +2,7 @@ .\" Copyright 1993, 1994, 1995 by Theodore Ts'o. All Rights Reserved. .\" This file may be copied under the terms of the GNU Public License. .\" -.TH E2FSCK 8 "February 2023" "E2fsprogs version 1.47.0" +.TH E2FSCK 8 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME e2fsck \- check a Linux ext2/ext3/ext4 file system .SH SYNOPSIS @@ -44,8 +44,9 @@ e2fsck \- check a Linux ext2/ext3/ext4 file system is used to check the ext2/ext3/ext4 family of file systems. For ext3 and ext4 file systems that use a journal, if the system has been shut down uncleanly without any errors, normally, after replaying the -committed transactions in the journal, the file system should be -marked as clean. Hence, for file systems that use journaling, +committed transactions in the journal, the file system should be +marked as clean. +Hence, for file systems that use journaling, .B e2fsck will normally replay the journal and exit, unless its superblock indicates that further checking is required. @@ -63,12 +64,14 @@ option is specified, and .BR \-c , .BR \-l , or -.B -L +.B \-L options are .I not -specified. However, even if it is safe to do so, the results printed by +specified. +However, even if it is safe to do so, the results printed by .B e2fsck -are not valid if the file system is mounted. If +are not valid if the file system is mounted. +If .B e2fsck asks whether or not you should check a file system which is mounted, the only correct answer is ``no''. Only experts who really know what @@ -80,10 +83,10 @@ is run in interactive mode (meaning that none of .BR \-y , .BR \-n , or -.BR \-p +.B \-p are specified), the program will ask the user to fix each problem found in the -file system. A response of 'y' will fix the error; 'n' will leave the error -unfixed; and 'a' will fix the problem and all subsequent problems; pressing +file system. A response of \&'y' will fix the error; \&'n' will leave the error +unfixed; and \&'a' will fix the problem and all subsequent problems; pressing Enter will proceed with the default response, which is printed before the question mark. Pressing Control-C terminates e2fsck immediately. .SH OPTIONS @@ -113,7 +116,7 @@ program using the option to print out where the superblocks exist, supposing .B mke2fs is supplied with arguments that are consistent with the file system's layout -(e.g. blocksize, blocks per group, +(e.g.\& blocksize, blocks per group, .BR sparse_super , etc.). .IP @@ -170,7 +173,7 @@ Print debugging output (useless unless you are debugging .B \-D Optimize directories in file system. This option causes e2fsck to try to optimize all directories, either by re-indexing them if the -file system supports directory indexing, or by sorting and compressing +file system supports directory indexing, or by sorting and compressing directories for smaller directories, or for file systems using traditional linear directories. .IP @@ -204,86 +207,92 @@ Set the version of the extended attribute blocks which will require while checking the file system. The version number may be 1 or 2. The default extended attribute version format is 2. .TP -.BI journal_only +.B journal_only Only replay the journal if required, but do not perform any further checks or repairs. .TP -.BI fragcheck +.B fragcheck During pass 1, print a detailed report of any discontiguous blocks for files in the file system. .TP -.BI discard +.B discard Attempt to discard free blocks and unused inode blocks after the full file system check (discarding blocks is useful on solid state devices and sparse -/ thin-provisioned storage). Note that discard is done in pass 5 AFTER the +/ thin-provisioned storage). +Note that discard is done in pass 5 AFTER the file system has been fully checked and only if it does not contain recognizable -errors. However there might be cases where +errors. +However there might be cases where .B e2fsck does not fully recognize a problem and hence in this case this option may prevent you from further manual data recovery. .TP -.BI nodiscard -Do not attempt to discard free blocks and unused inode blocks. This option is -exactly the opposite of discard option. This is set as default. +.B nodiscard +Do not attempt to discard free blocks and unused inode blocks. +This option is exactly the opposite of discard option. +This is set as default. .TP -.BI no_optimize_extents +.B no_optimize_extents Do not offer to optimize the extent tree by eliminating unnecessary width or depth. This can also be enabled in the options section of .BR /etc/e2fsck.conf . .TP -.BI optimize_extents +.B optimize_extents Offer to optimize the extent tree by eliminating unnecessary width or depth. This is the default unless otherwise specified in .BR /etc/e2fsck.conf . .TP -.BI inode_count_fullmap +.B inode_count_fullmap Trade off using memory for speed when checking a file system with a large number of hard-linked files. The amount of memory required is proportional to the number of inodes in the file system. For large file -systems, this can be gigabytes of memory. (For example, a 40TB file system +systems, this can be gigabytes of memory. (For example, a 40\ TB file system with 2.8 billion inodes will consume an additional 5.7 GB memory if this optimization is enabled.) This optimization can also be enabled in the options section of .BR /etc/e2fsck.conf . .TP -.BI no_inode_count_fullmap +.B no_inode_count_fullmap Disable the .B inode_count_fullmap optimization. This is the default unless otherwise specified in .BR /etc/e2fsck.conf . .TP -.BI readahead_kb +.B readahead_kb Use this many KiB of memory to pre-fetch metadata in the hopes of reducing e2fsck runtime. By default, this is set to the size of two block groups' inode -tables (typically 4MiB on a regular ext4 file system); if this amount is more +tables (typically 4\ MiB on a regular ext4 file system); if this amount is more than 1/50th of total physical memory, readahead is disabled. Set this to zero to disable readahead entirely. .TP -.BI bmap2extent +.B bmap2extent Convert block-mapped files to extent-mapped files. .TP -.BI fixes_only +.B fixes_only Only fix damaged metadata; do not optimize htree directories or compress -extent trees. This option is incompatible with the -D and -E bmap2extent +extent trees. This option is incompatible with the \-D and \-E bmap2extent options. .TP -.BI check_encoding +.B check_encoding Force verification of encoded filenames in case-insensitive directories. This is the default mode if the file system has the strict flag enabled. .TP -.BI unshare_blocks +.B unshare_blocks If the file system has shared blocks, with the shared blocks read-only feature enabled, then this will unshare all shared blocks and unset the read-only -feature bit. If there is not enough free space then the operation will fail. +feature bit. +If there is not enough free space then the operation will fail. If the file system does not have the read-only feature bit, but has shared -blocks anyway, then this option will have no effect. Note when using this +blocks anyway, then this option will have no effect. +Note when using this option, if there is no free space to clone blocks, there is no prompt to delete files and instead the operation will fail. .IP -Note that unshare_blocks implies the "-f" option to ensure that all passes -are run. Additionally, if "-n" is also specified, e2fsck will simulate trying -to allocate enough space to deduplicate. If this fails, the exit code will -be non-zero. +Note that unshare_blocks implies the "\-f" option to ensure that all passes +are run. +Additionally, if "\-n" is also specified, e2fsck will simulate trying +to allocate enough space to deduplicate. +If this fails, the exit code will be non-zero. .RE .TP .B \-f @@ -299,7 +308,7 @@ time trials. Set the pathname where the external-journal for this file system can be found. .TP -.BI \-k +.B \-k When combined with the .B \-c option, any existing bad blocks in the bad blocks list are preserved, @@ -318,7 +327,7 @@ of the file system. Hence, .BR badblocks (8) must be given the blocksize of the file system in order to obtain correct results. As a result, it is much simpler and safer to use the -.B -c +.B \-c option to .BR e2fsck , since it will assure that the correct parameters are passed to the @@ -391,7 +400,9 @@ options. .TP .BI \-z " undo_file" Before overwriting a file system block, write the old contents of the block to -an undo file. This undo file can be used with e2undo(8) to restore the old +an undo file. This undo file can be used with +.BR e2undo (8) +to restore the old contents of the file system should something go wrong. If the empty string is passed as the undo_file argument, the undo file will be written to a file named e2fsck-\fIdevice\fR.e2undo in the directory specified via the @@ -403,24 +414,23 @@ The exit code returned by .B e2fsck is the sum of the following conditions: .br -\ 0\ \-\ No errors -.br -\ 1\ \-\ File system errors corrected + 0 \-\ No errors .br -\ 2\ \-\ File system errors corrected, system should + 1 \-\ File system errors corrected .br -\ \ \ \ be rebooted + 2 \-\ File system errors corrected, system should .br -\ 4\ \-\ File system errors left uncorrected + \ \ be rebooted .br -\ 8\ \-\ Operational error + 4 \-\ File system errors left uncorrected .br -\ 16\ \-\ Usage or syntax error + 8 \-\ Operational error .br -\ 32\ \-\ E2fsck canceled by user request + 16 \-\ Usage or syntax error .br -\ 128\ \-\ Shared library error + 32 \-\ E2fsck canceled by user request .br + 128 \-\ Shared library error .SH SIGNALS The following signals have the following effect when sent to .BR e2fsck . @@ -454,7 +464,7 @@ the messages printed by are in English; if your system has been configured so that .BR e2fsck 's -messages have been translated into another language, please set the the +messages have been translated into another language, please set the .B LC_ALL environment variable to .B C @@ -492,7 +502,7 @@ Always include the full version string which displays when it is run, so I know which version you are running. .SH ENVIRONMENT .TP -.BI E2FSCK_CONFIG +.B E2FSCK_CONFIG Determines the location of the configuration file (see .BR e2fsck.conf (5)). .SH AUTHOR diff --git a/upstream/debian-bookworm/man8/e2image.8 b/upstream/debian-bookworm/man8/e2image.8 index 25673488..46b2122b 100644 --- a/upstream/debian-bookworm/man8/e2image.8 +++ b/upstream/debian-bookworm/man8/e2image.8 @@ -2,7 +2,7 @@ .\" Copyright 2001 by Theodore Ts'o. All Rights Reserved. .\" This file may be copied under the terms of the GNU Public License. .\" -.TH E2IMAGE 8 "February 2023" "E2fsprogs version 1.47.0" +.TH E2IMAGE 8 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME e2image \- Save critical ext2/ext3/ext4 file system metadata to a file diff --git a/upstream/debian-bookworm/man8/e2label.8 b/upstream/debian-bookworm/man8/e2label.8 index 29adae7e..78c54aba 100644 --- a/upstream/debian-bookworm/man8/e2label.8 +++ b/upstream/debian-bookworm/man8/e2label.8 @@ -2,7 +2,7 @@ .\" Copyright 1993, 1994, 1995 by Theodore Ts'o. All Rights Reserved. .\" This file may be copied under the terms of the GNU Public License. .\" -.TH E2LABEL 8 "February 2023" "E2fsprogs version 1.47.0" +.TH E2LABEL 8 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME e2label \- Change the label on an ext2/ext3/ext4 file system .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man8/e2mmpstatus.8 b/upstream/debian-bookworm/man8/e2mmpstatus.8 index 47a4624e..c72927a7 100644 --- a/upstream/debian-bookworm/man8/e2mmpstatus.8 +++ b/upstream/debian-bookworm/man8/e2mmpstatus.8 @@ -1,7 +1,7 @@ .\" -*- nroff -*- .\" This file may be copied under the terms of the GNU Public License. .\" -.TH E2MMPSTATUS 8 "February 2023" "E2fsprogs version 1.47.0" +.TH E2MMPSTATUS 8 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME e2mmpstatus \- Check MMP status of an ext4 file system .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man8/e2scrub.8 b/upstream/debian-bookworm/man8/e2scrub.8 index 6923c679..9511d849 100644 --- a/upstream/debian-bookworm/man8/e2scrub.8 +++ b/upstream/debian-bookworm/man8/e2scrub.8 @@ -1,4 +1,4 @@ -.TH E2SCRUB 8 "February 2023" "E2fsprogs version 1.47.0" +.TH E2SCRUB 8 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME e2scrub - check the contents of a mounted ext[234] file system .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man8/e2scrub_all.8 b/upstream/debian-bookworm/man8/e2scrub_all.8 index a2b962d9..6972e286 100644 --- a/upstream/debian-bookworm/man8/e2scrub_all.8 +++ b/upstream/debian-bookworm/man8/e2scrub_all.8 @@ -1,4 +1,4 @@ -.TH E2SCRUB 8 "February 2023" "E2fsprogs version 1.47.0" +.TH E2SCRUB 8 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME e2scrub_all - check all mounted ext[234] file systems for errors. .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man8/e2undo.8 b/upstream/debian-bookworm/man8/e2undo.8 index 8b90f7aa..22a9e5ce 100644 --- a/upstream/debian-bookworm/man8/e2undo.8 +++ b/upstream/debian-bookworm/man8/e2undo.8 @@ -2,7 +2,7 @@ .\" Copyright 2008 by Theodore Ts'o. All Rights Reserved. .\" This file may be copied under the terms of the GNU Public License. .\" -.TH E2UNDO 8 "February 2023" "E2fsprogs version 1.47.0" +.TH E2UNDO 8 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME e2undo \- Replay an undo log for an ext2/ext3/ext4 file system .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man8/e4crypt.8 b/upstream/debian-bookworm/man8/e4crypt.8 index 579397f2..48df35f4 100644 --- a/upstream/debian-bookworm/man8/e4crypt.8 +++ b/upstream/debian-bookworm/man8/e4crypt.8 @@ -1,4 +1,4 @@ -.TH E4CRYPT 8 "February 2023" "E2fsprogs version 1.47.0" +.TH E4CRYPT 8 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME e4crypt \- ext4 file system encryption utility .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man8/filefrag.8 b/upstream/debian-bookworm/man8/filefrag.8 index 5cfa0523..a322b4c6 100644 --- a/upstream/debian-bookworm/man8/filefrag.8 +++ b/upstream/debian-bookworm/man8/filefrag.8 @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH FILEFRAG 8 "February 2023" "E2fsprogs version 1.47.0" +.TH FILEFRAG 8 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME filefrag \- report on file fragmentation .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man8/grub-bios-setup.8 b/upstream/debian-bookworm/man8/grub-bios-setup.8 index 0530de85..7ec17c08 100644 --- a/upstream/debian-bookworm/man8/grub-bios-setup.8 +++ b/upstream/debian-bookworm/man8/grub-bios-setup.8 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-BIOS-SETUP "8" "October 2023" "GRUB 2.06-13+deb12u1" "System Administration Utilities" +.TH GRUB-BIOS-SETUP "8" "February 2024" "GRUB 2.12-1~bpo12+1" "System Administration Utilities" .SH NAME grub-bios-setup \- set up a device to boot using GRUB .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man8/grub-macbless.8 b/upstream/debian-bookworm/man8/grub-macbless.8 index ad1b6d63..b6280ae7 100644 --- a/upstream/debian-bookworm/man8/grub-macbless.8 +++ b/upstream/debian-bookworm/man8/grub-macbless.8 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-MACBLESS "8" "October 2023" "GRUB 2.06-13+deb12u1" "System Administration Utilities" +.TH GRUB-MACBLESS "8" "February 2024" "GRUB 2.12-1~bpo12+1" "System Administration Utilities" .SH NAME grub-macbless \- bless a mac file/directory .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man8/grub-mkconfig.8 b/upstream/debian-bookworm/man8/grub-mkconfig.8 index ff56cc14..0721f16d 100644 --- a/upstream/debian-bookworm/man8/grub-mkconfig.8 +++ b/upstream/debian-bookworm/man8/grub-mkconfig.8 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-MKCONFIG "8" "October 2023" "GRUB 2.06-13+deb12u1" "System Administration Utilities" +.TH GRUB-MKCONFIG "8" "February 2024" "GRUB 2.12-1~bpo12+1" "System Administration Utilities" .SH NAME grub-mkconfig \- generate a GRUB configuration file .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man8/grub-mkdevicemap.8 b/upstream/debian-bookworm/man8/grub-mkdevicemap.8 index 2eb114ac..dbb6fcb8 100644 --- a/upstream/debian-bookworm/man8/grub-mkdevicemap.8 +++ b/upstream/debian-bookworm/man8/grub-mkdevicemap.8 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-MKDEVICEMAP "8" "October 2023" "GRUB 2.06-13+deb12u1" "System Administration Utilities" +.TH GRUB-MKDEVICEMAP "8" "February 2024" "GRUB 2.12-1~bpo12+1" "System Administration Utilities" .SH NAME grub-mkdevicemap \- make a device map file automatically .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man8/grub-probe.8 b/upstream/debian-bookworm/man8/grub-probe.8 index d96f21c2..2b96e669 100644 --- a/upstream/debian-bookworm/man8/grub-probe.8 +++ b/upstream/debian-bookworm/man8/grub-probe.8 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GRUB-PROBE "8" "October 2023" "GRUB 2.06-13+deb12u1" "System Administration Utilities" +.TH GRUB-PROBE "8" "February 2024" "GRUB 2.12-1~bpo12+1" "System Administration Utilities" .SH NAME grub-probe \- probe device information for GRUB .SH SYNOPSIS @@ -30,7 +30,8 @@ hints_string, ieee1275_hints, msdos_parttype, partmap, partuuid, zero_check [default=fs] .TP \fB\-v\fR, \fB\-\-verbose\fR -print verbose messages. +print verbose messages (pass twice to enable +debug printing). .TP \-?, \fB\-\-help\fR give this help list diff --git a/upstream/debian-bookworm/man8/ip-address.8 b/upstream/debian-bookworm/man8/ip-address.8 index 8e0de0e9..277c5068 100644 --- a/upstream/debian-bookworm/man8/ip-address.8 +++ b/upstream/debian-bookworm/man8/ip-address.8 @@ -146,7 +146,8 @@ ip-address \- protocol address management .BR ipvlan " |" .BR lowpan " |" .BR geneve " |" -.BR macsec " ]" +.BR macsec " |" +.BR netkit " ]" .SH "DESCRIPTION" The diff --git a/upstream/debian-bookworm/man8/ip-ioam.8 b/upstream/debian-bookworm/man8/ip-ioam.8 index 1bdc0ece..c723d782 100644 --- a/upstream/debian-bookworm/man8/ip-ioam.8 +++ b/upstream/debian-bookworm/man8/ip-ioam.8 @@ -49,12 +49,17 @@ ip-ioam \- IPv6 In-situ OAM (IOAM) .RI " { " ID " | " .BR none " }" +.ti -8 +.B ip ioam monitor + .SH DESCRIPTION The \fBip ioam\fR command is used to configure IPv6 In-situ OAM (IOAM6) internal parameters, namely IOAM namespaces and schemas. .PP Those parameters also include the mapping between an IOAM namespace and an IOAM schema. +.PP +The \fBip ioam monitor\fR command displays IOAM data received. .SH EXAMPLES .PP diff --git a/upstream/debian-bookworm/man8/ip-l2tp.8 b/upstream/debian-bookworm/man8/ip-l2tp.8 index 9aba6bec..7109c0a0 100644 --- a/upstream/debian-bookworm/man8/ip-l2tp.8 +++ b/upstream/debian-bookworm/man8/ip-l2tp.8 @@ -392,7 +392,7 @@ If L2TP is being used over IPv6, use the IPv6 defrag module. .SH INTEROPERABILITY .PP Unmanaged (static) L2TPv3 tunnels are supported by some network -equipment equipment vendors such as Cisco. +equipment vendors such as Cisco. .PP In Linux, L2TP Hello messages are not supported in unmanaged tunnels. Hello messages are used by L2TP clients and servers to detect diff --git a/upstream/debian-bookworm/man8/ip-link.8 b/upstream/debian-bookworm/man8/ip-link.8 index 209ae825..e3c71efd 100644 --- a/upstream/debian-bookworm/man8/ip-link.8 +++ b/upstream/debian-bookworm/man8/ip-link.8 @@ -63,7 +63,7 @@ ip-link \- network device configuration .RI "[ " ARGS " ]" .ti -8 -.BR "ip link set " { +.BR "ip link" " { " set " | " change " } " { .IR DEVICE " | " .BI "group " GROUP } @@ -247,6 +247,7 @@ ip-link \- network device configuration .BR macvlan " | " .BR macvtap " | " .BR netdevsim " |" +.BR netkit " |" .BR nlmon " |" .BR rmnet " |" .BR sit " |" @@ -384,6 +385,9 @@ Link types: .BR netdevsim - Interface for netdev API tests .sp +.BR netkit +- BPF-programmable network device +.sp .BR nlmon - Netlink monitoring device .sp @@ -441,6 +445,11 @@ TCP for IPv6 on this device when the size is greater than 65536. specifies the recommended maximum size of a IPv4 Generic Segment Offload packet the new device should accept. This is especially used to enable BIG TCP for IPv4 on this device by setting to a size greater than 65536. +Note that +.B gso_max_size +needs to be set to a size greater than or equal to +.B gso_ipv4_max_size +to really enable BIG TCP for IPv4. .TP .BI gso_max_segs " SEGMENTS " @@ -849,6 +858,46 @@ tunnel. .in -8 .TP +netkit Type Support +For a link of type +.I netkit +the following additional arguments are supported: + +.BI "ip link add " DEVICE +.BR type " netkit " +[ +.BI mode " MODE " +] [ +.I "POLICY " +] [ +.BR peer +[ +.I "POLICY " +] [ +.I "NAME " +] ] + +.in +8 + +.sp +.BI mode " MODE" +- specifies the operation mode of the netkit device with "l3" and "l2" +as possible values. Default option is "l3". + +.sp +.I "POLICY" +- specifies the default device policy when no BPF programs are attached +with "forward" and "blackhole" as possible values. Default option is +"forward". Specifying policy before the peer option refers to the primary +device, after the peer option refers to the peer device. + +.sp +.I "NAME" +- specifies the device name of the peer device. + +.in -8 + +.TP IPIP, SIT Type Support For a link of type .IR IPIP or SIT diff --git a/upstream/debian-bookworm/man8/ip-netns.8 b/upstream/debian-bookworm/man8/ip-netns.8 index 0c03fdb3..cad9c55b 100644 --- a/upstream/debian-bookworm/man8/ip-netns.8 +++ b/upstream/debian-bookworm/man8/ip-netns.8 @@ -98,7 +98,7 @@ If NAME is available in /run/netns this command creates a new network namespace and assigns NAME. .TP -.B ip netns attach NAME PID - create a new named network namespace +.B ip netns attach NAME PID - assign a name to the network namespace of the process .sp If NAME is available in /run/netns this command attaches the network namespace of the process PID to NAME as if it were created with ip netns. diff --git a/upstream/debian-bookworm/man8/ip-route.8 b/upstream/debian-bookworm/man8/ip-route.8 index 8a7553c2..aa8a1a87 100644 --- a/upstream/debian-bookworm/man8/ip-route.8 +++ b/upstream/debian-bookworm/man8/ip-route.8 @@ -29,6 +29,7 @@ ip-route \- routing table management .ti -8 .B ip route get .I ROUTE_GET_FLAGS +.B [ to ] .IR ADDRESS " [ " .BI from " ADDRESS " iif " STRING" .RB " ] [ " oif @@ -44,7 +45,9 @@ ip-route \- routing table management .B sport .IR NUMBER " ] [ " .B dport -.IR NUMBER " ] " +.IR NUMBER " ] [" +.B as +.IR ADDRESS " ]" .ti -8 .BR "ip route" " { " add " | " del " | " change " | " append " | "\ @@ -263,9 +266,14 @@ throw " | " unreachable " | " prohibit " | " blackhole " | " nat " ]" .ti -8 .IR ROUTE_GET_FLAGS " := " -.BR " [ " -.BR fibmatch -.BR " ] " +.IR ROUTE_GET_FLAG " [ " +.IR ROUTE_GET_FLAGS " ] " + +.ti -8 +.IR ROUTE_GET_FLAG " := " +.BR "[ " +.BR connected " | " fibmatch " | " notify +.BR "]" .SH DESCRIPTION .B ip route diff --git a/upstream/debian-bookworm/man8/ip.8 b/upstream/debian-bookworm/man8/ip.8 index 72227d44..fdae57c5 100644 --- a/upstream/debian-bookworm/man8/ip.8 +++ b/upstream/debian-bookworm/man8/ip.8 @@ -19,10 +19,12 @@ ip \- show / manipulate routing, network devices, interfaces and tunnels .ti -8 .IR OBJECT " := { " -.BR link " | " address " | " addrlabel " | " route " | " rule " | " neigh " | "\ - ntable " | " tunnel " | " tuntap " | " maddress " | " mroute " | " mrule " | "\ - monitor " | " xfrm " | " netns " | " l2tp " | " tcp_metrics " | " token " | "\ - macsec " | " vrf " | " mptcp " | " ioam " | " stats " }" +.BR address " | " addrlabel " | " fou " | " help " | " ila " | " ioam " | "\ + l2tp " | " link " | " macsec " | " maddress " | " monitor " | " mptcp " | "\ + mroute " | " mrule " | " neighbor " | " neighbour " | " netconf " | "\ + netns " | " nexthop " | " ntable " | " ntbl " | " route " | " rule " | "\ + sr " | " tap " | " tcpmetrics " | " token " | " tunnel " | " tuntap " | "\ + vrf " | " xfrm " }" .sp .ti -8 @@ -255,6 +257,14 @@ Request the kernel to send the applied configuration back. - label configuration for protocol address selection. .TP +.B fou +- Foo-over-UDP receive port configuration. + +.TP +.B ila +- manage identifier locator addresses (ILA). + +.TP .B ioam - manage IOAM namespaces and IOAM schemas. @@ -267,6 +277,10 @@ Request the kernel to send the applied configuration back. - network device. .TP +.B macsec +- MACsec device configuration. + +.TP .B maddress - multicast address. @@ -291,10 +305,18 @@ Request the kernel to send the applied configuration back. - manage ARP or NDISC cache entries. .TP +.B netconf +- network configuration monitoring. + +.TP .B netns - manage network namespaces. .TP +.B nexthop +- manage nexthop objects. + +.TP .B ntable - manage the neighbor cache's operation. @@ -307,12 +329,16 @@ Request the kernel to send the applied configuration back. - rule in routing policy database. .TP +.B sr +- manage IPv6 segment routing. + +.TP .B stats - manage and show interface statistics. .TP .B tcp_metrics/tcpmetrics -- manage TCP Metrics +- manage TCP Metrics. .TP .B token @@ -415,19 +441,24 @@ was written by Alexey N. Kuznetsov and added in Linux 2.2. .SH SEE ALSO .BR ip-address (8), .BR ip-addrlabel (8), +.BR ip-fou (8), .BR ip-ioam (8), .BR ip-l2tp (8), .BR ip-link (8), +.BR ip-macsec (8), .BR ip-maddress (8), .BR ip-monitor (8), .BR ip-mptcp (8), .BR ip-mroute (8), .BR ip-neighbour (8), +.BR ip-netconf (8), .BR ip-netns (8), +.BR ip-nexthop (8), .BR ip-ntable (8), .BR ip-route (8), .BR ip-rule (8), -.BR ip-stats (8) +.BR ip-sr (8), +.BR ip-stats (8), .BR ip-tcp_metrics (8), .BR ip-token (8), .BR ip-tunnel (8), diff --git a/upstream/debian-bookworm/man8/mke2fs.8 b/upstream/debian-bookworm/man8/mke2fs.8 index d39c024b..c3bf90eb 100644 --- a/upstream/debian-bookworm/man8/mke2fs.8 +++ b/upstream/debian-bookworm/man8/mke2fs.8 @@ -2,7 +2,7 @@ .\" Copyright 1993, 1994, 1995 by Theodore Ts'o. All Rights Reserved. .\" This file may be copied under the terms of the GNU Public License. .\" -.TH MKE2FS 8 "February 2023" "E2fsprogs version 1.47.0" +.TH MKE2FS 8 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME mke2fs \- create an ext2/ext3/ext4 file system .SH SYNOPSIS @@ -23,7 +23,7 @@ mke2fs \- create an ext2/ext3/ext4 file system ] [ .B \-d -.I root-directory +.I root-directory|tarball ] [ .B \-D @@ -232,16 +232,18 @@ test is used instead of a fast read-only test. .TP .B \-C " cluster-size" Specify the size of cluster in bytes for file systems using the bigalloc -feature. Valid cluster-size values are from 2048 to 256M bytes per -cluster. This can only be specified if the bigalloc feature is -enabled. (See the +feature. Valid cluster-size values range from 2 to 32768 times the +filesystem blocksize and must be a power of 2. The cluster-size can +only be specified if the bigalloc feature is enabled. (See the .B ext4 (5) man page for more details about bigalloc.) The default cluster size if bigalloc is enabled is 16 times the block size. .TP -.BI \-d " root-directory" -Copy the contents of the given directory into the root directory of the -file system. +.BI \-d " root-directory|tarball" +Copy the contents of the given directory or tarball into the root directory of the +file system. Tarball input is only available if mke2fs was compiled with +libarchive support enabled and if the libarchive shared library is available +at run-time. The special value "-" will read a tarball from standard input. .TP .B \-D Use direct I/O when writing to the disk. This avoids mke2fs dirtying a @@ -406,6 +408,11 @@ The \fBroot_owner=\fR option allows explicitly specifying these values, and avoid side-effects for users that do not expect the contents of the file system to change based on the user running \fBmke2fs\fR. .TP +.BI root_perms [=permissions] +Specify the root directory permissions in octal format. If no permissions +are specified then the root directory permissions would be set in accordance with +the default filesystem umask. +.TP .B test_fs Set a flag in the file system superblock indicating that it may be mounted using experimental kernel code, such as the ext4dev file system. @@ -508,8 +515,8 @@ The default inode size is controlled by the file. In the .B mke2fs.conf file shipped with e2fsprogs, the default inode size is 256 bytes for -most file systems, except for small file systems where the inode size -will be 128 bytes. +all file systems, except for the GNU Hurd since it only supports +128-byte inodes. .TP .B \-j Create the file system with an ext3 journal. If the diff --git a/upstream/debian-bookworm/man8/mklost+found.8 b/upstream/debian-bookworm/man8/mklost+found.8 index 54e39f90..08799773 100644 --- a/upstream/debian-bookworm/man8/mklost+found.8 +++ b/upstream/debian-bookworm/man8/mklost+found.8 @@ -2,7 +2,7 @@ .\" Copyright 1993, 1994, 1995 by Theodore Ts'o. All Rights Reserved. .\" This file may be copied under the terms of the GNU Public License. .\" -.TH MKLOST+FOUND 8 "February 2023" "E2fsprogs version 1.47.0" +.TH MKLOST+FOUND 8 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME mklost+found \- create a lost+found directory on a mounted Linux second extended file system diff --git a/upstream/debian-bookworm/man8/net.8 b/upstream/debian-bookworm/man8/net.8 index 9296ccde..2083366c 100644 --- a/upstream/debian-bookworm/man8/net.8 +++ b/upstream/debian-bookworm/man8/net.8 @@ -2,12 +2,12 @@ .\" Title: net .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 02/05/2024 +.\" Date: 05/08/2024 .\" Manual: System Administration tools -.\" Source: Samba 4.19.4-Debian +.\" Source: Samba 4.19.6-Debian .\" Language: English .\" -.TH "NET" "8" "02/05/2024" "Samba 4\&.19\&.4\-Debian" "System Administration tools" +.TH "NET" "8" "05/08/2024" "Samba 4\&.19\&.6\-Debian" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/upstream/debian-bookworm/man8/resize2fs.8 b/upstream/debian-bookworm/man8/resize2fs.8 index 52c9e848..a2f50397 100644 --- a/upstream/debian-bookworm/man8/resize2fs.8 +++ b/upstream/debian-bookworm/man8/resize2fs.8 @@ -1,8 +1,8 @@ .\" -*- nroff -*- .\" Copyright 1997 by Theodore Ts'o. All Rights Reserved. .\" -.\" .TH RESIZE2FS 8 "February 2023" "E2fsprogs version 1.47.0" -.TH RESIZE2FS 8 "February 2023" "E2fsprogs version 1.47.0" +.\" .TH RESIZE2FS 8 "May 2024" "E2fsprogs version 1.47.1-rc2" +.TH RESIZE2FS 8 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME resize2fs \- ext2/ext3/ext4 file system resizer .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man8/rfkill.8 b/upstream/debian-bookworm/man8/rfkill.8 index 5d79d7f8..70826165 100644 --- a/upstream/debian-bookworm/man8/rfkill.8 +++ b/upstream/debian-bookworm/man8/rfkill.8 @@ -2,12 +2,12 @@ .\" Title: rfkill .\" Author: [see the "AUTHOR(S)" section] .\" Generator: Asciidoctor 2.0.18 -.\" Date: 2023-03-23 +.\" Date: 2024-03-28 .\" Manual: System Administration .\" Source: util-linux 2.38.1 .\" Language: English .\" -.TH "RFKILL" "8" "2023-03-23" "util\-linux 2.38.1" "System Administration" +.TH "RFKILL" "8" "2024-03-28" "util\-linux 2.38.1" "System Administration" .ie \n(.g .ds Aq \(aq .el .ds Aq ' .ss \n[.ss] 0 diff --git a/upstream/debian-bookworm/man8/samba-dcerpcd.8 b/upstream/debian-bookworm/man8/samba-dcerpcd.8 index dbaa6d63..0bde22a0 100644 --- a/upstream/debian-bookworm/man8/samba-dcerpcd.8 +++ b/upstream/debian-bookworm/man8/samba-dcerpcd.8 @@ -2,12 +2,12 @@ .\" Title: samba-dcerpcd .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 02/05/2024 +.\" Date: 05/08/2024 .\" Manual: System Administration tools -.\" Source: Samba 4.19.4-Debian +.\" Source: Samba 4.19.6-Debian .\" Language: English .\" -.TH "SAMBA\-DCERPCD" "8" "02/05/2024" "Samba 4\&.19\&.4\-Debian" "System Administration tools" +.TH "SAMBA\-DCERPCD" "8" "05/08/2024" "Samba 4\&.19\&.6\-Debian" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/upstream/debian-bookworm/man8/samba-regedit.8 b/upstream/debian-bookworm/man8/samba-regedit.8 index 31477883..2eacfbca 100644 --- a/upstream/debian-bookworm/man8/samba-regedit.8 +++ b/upstream/debian-bookworm/man8/samba-regedit.8 @@ -2,12 +2,12 @@ .\" Title: samba-regedit .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 02/05/2024 +.\" Date: 05/08/2024 .\" Manual: System Administration tools -.\" Source: Samba 4.19.4-Debian +.\" Source: Samba 4.19.6-Debian .\" Language: English .\" -.TH "SAMBA\-REGEDIT" "8" "02/05/2024" "Samba 4\&.19\&.4\-Debian" "System Administration tools" +.TH "SAMBA\-REGEDIT" "8" "05/08/2024" "Samba 4\&.19\&.6\-Debian" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -365,7 +365,7 @@ In case you need more fine grained control you can use: .RE .SH "VERSION" .PP -This man page is part of version 4\&.19\&.4\-Debian of the Samba suite\&. +This man page is part of version 4\&.19\&.6\-Debian of the Samba suite\&. .SH "SEE ALSO" .PP \fBsmbd\fR(8), diff --git a/upstream/debian-bookworm/man8/samba-tool.8 b/upstream/debian-bookworm/man8/samba-tool.8 index 04679402..7f79efd1 100644 --- a/upstream/debian-bookworm/man8/samba-tool.8 +++ b/upstream/debian-bookworm/man8/samba-tool.8 @@ -2,12 +2,12 @@ .\" Title: samba-tool .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 02/05/2024 +.\" Date: 05/08/2024 .\" Manual: System Administration tools -.\" Source: Samba 4.19.4-Debian +.\" Source: Samba 4.19.6-Debian .\" Language: English .\" -.TH "SAMBA\-TOOL" "8" "02/05/2024" "Samba 4\&.19\&.4\-Debian" "System Administration tools" +.TH "SAMBA\-TOOL" "8" "05/08/2024" "Samba 4\&.19\&.6\-Debian" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1869,7 +1869,7 @@ because the repsFrom/To objects are not replicated, and it can reveal replicatio Gives usage information\&. .SH "VERSION" .PP -This man page is complete for version 4\&.19\&.4\-Debian of the Samba suite\&. +This man page is complete for version 4\&.19\&.6\-Debian of the Samba suite\&. .SH "AUTHOR" .PP The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&. diff --git a/upstream/debian-bookworm/man8/smbpasswd.8 b/upstream/debian-bookworm/man8/smbpasswd.8 index 4cad5d03..e4715baa 100644 --- a/upstream/debian-bookworm/man8/smbpasswd.8 +++ b/upstream/debian-bookworm/man8/smbpasswd.8 @@ -2,12 +2,12 @@ .\" Title: smbpasswd .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 02/05/2024 +.\" Date: 05/08/2024 .\" Manual: System Administration tools -.\" Source: Samba 4.19.4-Debian +.\" Source: Samba 4.19.6-Debian .\" Language: English .\" -.TH "SMBPASSWD" "8" "02/05/2024" "Samba 4\&.19\&.4\-Debian" "System Administration tools" +.TH "SMBPASSWD" "8" "05/08/2024" "Samba 4\&.19\&.6\-Debian" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -314,7 +314,7 @@ file and neglecting to allow "localhost" access to the smbd\&. In addition, the smbpasswd command is only useful if Samba has been set up to use encrypted passwords\&. .SH "VERSION" .PP -This man page is part of version 4\&.19\&.4\-Debian of the Samba suite\&. +This man page is part of version 4\&.19\&.6\-Debian of the Samba suite\&. .SH "SEE ALSO" .PP \fBsmbpasswd\fR(5), diff --git a/upstream/debian-bookworm/man8/ss.8 b/upstream/debian-bookworm/man8/ss.8 index 073e9f03..e23af826 100644 --- a/upstream/debian-bookworm/man8/ss.8 +++ b/upstream/debian-bookworm/man8/ss.8 @@ -24,6 +24,9 @@ Output version information. .B \-H, \-\-no-header Suppress header line. .TP +.B \-Q, \-\-no-queues +Suppress sending and receiving queue columns. +.TP .B \-O, \-\-oneline Print each socket's data on a single line. .TP @@ -40,6 +43,10 @@ established connections) sockets. .B \-l, \-\-listening Display only listening sockets (these are omitted by default). .TP +.B \-B, \-\-bound-inactive +Display only TCP bound but inactive (not listening, connecting, etc.) sockets +(these are omitted by default). +.TP .B \-o, \-\-options Show timer information. For TCP protocol, the output format is: .RS @@ -419,6 +426,12 @@ to FILE after applying filters. If FILE is - stdout is used. Read filter information from FILE. Each line of FILE is interpreted like single command line option. If FILE is - stdin is used. .TP +.B \-\-bpf-maps +Pretty-print all the BPF socket-local data entries for each socket. +.TP +.B \-\-bpf-map-id=MAP_ID +Pretty-print the BPF socket-local data entries for the requested map ID. Can be used more than once. +.TP .B FILTER := [ state STATE-FILTER ] [ EXPRESSION ] Please take a look at the official documentation for details regarding filters. @@ -456,6 +469,9 @@ states except for - opposite to .B bucket +.B bound-inactive +- bound but otherwise inactive sockets (not listening, connecting, etc.) + .SH EXPRESSION .B EXPRESSION diff --git a/upstream/debian-bookworm/man8/tc-bfifo.8 b/upstream/debian-bookworm/man8/tc-bfifo.8 index 3e290322..bc05ef4d 100644 --- a/upstream/debian-bookworm/man8/tc-bfifo.8 +++ b/upstream/debian-bookworm/man8/tc-bfifo.8 @@ -37,8 +37,6 @@ If the list is too long, no further packets are allowed on. This is called 'tail limit Maximum queue size. Specified in bytes for bfifo, in packets for pfifo. For pfifo, defaults to the interface txqueuelen, as specified with -.BR ifconfig (8) -or .BR ip (8). The range for this parameter is [0, UINT32_MAX]. diff --git a/upstream/debian-bookworm/man8/tc-gact.8 b/upstream/debian-bookworm/man8/tc-gact.8 new file mode 100644 index 00000000..81aa30eb --- /dev/null +++ b/upstream/debian-bookworm/man8/tc-gact.8 @@ -0,0 +1,85 @@ +.TH "Generic actions in tc" 8 "11 Jan 2023" "iproute2" "Linux" + +.SH NAME +gact - generic action +.SH SYNOPSIS +.in +8 +.ti -8 +.BR tc " ... " "action gact" +.IR CONTROL " [ " RAND " ] [ " INDEX " ]" +.ti -8 +.IR CONTROL " := { " +.BR reclassify " | " drop " | " continue " | " pass " | " pipe " | " +.br +.BI "goto chain " "CHAIN_INDEX" +| +.br +.BI "jump " "JUMP_COUNT" +} + +.ti -8 +.IR RAND " := " +.BI random " RANDTYPE CONTROL VAL" +.ti -8 +.IR RANDTYPE " := { " +.BR netrand " | " determ " }" +.ti -8 +.IR VAL " := number not exceeding 10000" +.ti -8 +.IR JUMP_COUNT " := absolute jump from start of action list" +.ti -8 +.IR INDEX " := index value used" + +.SH DESCRIPTION +The +.B gact +action allows reclassify, dropping, passing, or accepting packets. +At the moment there are only two algorithms. One is deterministic +and the other uses internal kernel netrand. + +.SH OPTIONS +.TP +.BI random " RANDTYPE CONTROL VAL" +The probability of taking the action expressed in terms of 1 out of +.I VAL +packets. + +.TP +.I CONTROL +Indicate how +.B tc +should proceed if the packet matches. +For a description of the possible +.I CONTROL +values, see +.BR tc-actions (8). + +.SH EXAMPLES +Apply a rule on ingress to drop packets from a given source address. +.RS +.EX +# tc filter add dev eth0 parent ffff: protocol ip prio 6 u32 match ip src \ +10.0.0.9/32 flowid 1:16 action drop +.EE +.RE + +Allow 1 out 10 packets from source randomly using the netrand generator +.RS +.EX +# tc filter add dev eth0 parent ffff: protocol ip prio 6 u32 match ip src \ +10.0.0.9/32 flowid 1:16 action drop random netrand ok 10 +.EE +.RE + +Deterministically accept every second packet +.RS +.EX +# tc filter add dev eth0 parent ffff: protocol ip prio 6 u32 match ip src \ +10.0.0.9/32 flowid 1:16 action drop random determ ok 2 +.EE +.RE + +.SH SEE ALSO +.BR tc (8), +.BR tc-actions (8), +.BR tc-u32 (8) diff --git a/upstream/debian-bookworm/man8/tc-htb.8 b/upstream/debian-bookworm/man8/tc-htb.8 index 7aa62615..59b159fb 100644 --- a/upstream/debian-bookworm/man8/tc-htb.8 +++ b/upstream/debian-bookworm/man8/tc-htb.8 @@ -36,7 +36,7 @@ bytes .SH DESCRIPTION HTB allows control of the outbound bandwidth on a given link. -It allows simulating simulating several slower links and to send different +It allows simulating several slower links and to send different kinds of traffic on different simulated links. In both cases, you have to specify how to divide the physical link into simulated links and how to decide which simulated link to use for a given packet to be sent. diff --git a/upstream/debian-bookworm/man8/tc-matchall.8 b/upstream/debian-bookworm/man8/tc-matchall.8 index d0224066..538cf745 100644 --- a/upstream/debian-bookworm/man8/tc-matchall.8 +++ b/upstream/debian-bookworm/man8/tc-matchall.8 @@ -37,39 +37,39 @@ To create ingress mirroring from port eth1 to port eth2: .RS .EX -tc qdisc add dev eth1 handle ffff: ingress -tc filter add dev eth1 parent ffff: \\ +tc qdisc add dev eth1 handle ffff: clsact +tc filter add dev eth1 ingress \\ matchall skip_sw \\ action mirred egress mirror \\ dev eth2 .EE .RE -The first command creates an ingress qdisc with handle +The first command creates a clsact qdisc with handle .BR ffff: on device .BR eth1 where the second command attaches a matchall filters on it that mirrors the -packets to device eth2. +packets to device eth2 for ingress. To create egress mirroring from port eth1 to port eth2: .RS .EX -tc qdisc add dev eth1 handle 1: root prio -tc filter add dev eth1 parent 1: \\ +tc qdisc add dev eth1 handle ffff: clsact +tc filter add dev eth1 egress \\ matchall skip_sw \\ action mirred egress mirror \\ dev eth2 .EE .RE -The first command creates an egress qdisc with handle -.BR 1: -that replaces the root qdisc on device +The first command creates a clsact qdisc with handle +.BR ffff: +on device .BR eth1 where the second command attaches a matchall filters on it that mirrors the -packets to device eth2. +packets to device eth2 for egress. To sample one of every 100 packets flowing into interface eth0 to psample group 12: diff --git a/upstream/debian-bookworm/man8/tc-mirred.8 b/upstream/debian-bookworm/man8/tc-mirred.8 index 38833b45..6959e3e6 100644 --- a/upstream/debian-bookworm/man8/tc-mirred.8 +++ b/upstream/debian-bookworm/man8/tc-mirred.8 @@ -9,13 +9,24 @@ mirred - mirror/redirect action .I DIRECTION ACTION .RB "[ " index .IR INDEX " ] " -.BI dev " DEVICENAME" +.I TARGET .ti -8 .IR DIRECTION " := { " .BR ingress " | " egress " }" .ti -8 +.IR TARGET " := { " DEV " | " BLOCK " }" + +.ti -8 +.IR DEV " := " +.BI dev " DEVICENAME" + +.ti -8 +.IR BLOCK " := " +.BI blockid " BLOCKID" + +.ti -8 .IR ACTION " := { " .BR mirror " | " redirect " }" .SH DESCRIPTION @@ -24,6 +35,12 @@ The action allows packet mirroring (copying) or redirecting (stealing) the packet it receives. Mirroring is what is sometimes referred to as Switch Port Analyzer (SPAN) and is commonly used to analyze and/or debug flows. +When mirroring to a tc block, the packet will be mirrored to all the ports in +the block with exception of the port where the packet ingressed, if that port is +part of the tc block. Redirecting is similar to mirroring except that the +behaviour is to mirror to the first N - 1 ports in the block and redirect to the +last one (note that the port in which the packet arrived is not going to be +mirrored or redirected to). .SH OPTIONS .TP .B ingress @@ -39,7 +56,7 @@ Define whether the packet should be copied .RB ( mirror ) or moved .RB ( redirect ) -to the destination interface. +to the destination interface or block. .TP .BI index " INDEX" Assign a unique ID to this action instead of letting the kernel choose one @@ -49,14 +66,17 @@ is a 32bit unsigned integer greater than zero. .TP .BI dev " DEVICENAME" Specify the network interface to redirect or mirror to. +.TP +.BI blockid " BLOCKID" +Specify the tc block to redirect or mirror to. .SH EXAMPLES Limit ingress bandwidth on eth0 to 1mbit/s, redirect exceeding traffic to lo for debugging purposes: .RS .EX -# tc qdisc add dev eth0 handle ffff: ingress -# tc filter add dev eth0 parent ffff: u32 \\ +# tc qdisc add dev eth0 handle ffff: clsact +# tc filter add dev eth0 ingress u32 \\ match u32 0 0 \\ action police rate 1mbit burst 100k conform-exceed pipe \\ action mirred egress redirect dev lo @@ -70,8 +90,8 @@ with e.g. tcpdump: .EX # ip link add dummy0 type dummy # ip link set dummy0 up -# tc qdisc add dev eth0 handle ffff: ingress -# tc filter add dev eth0 parent ffff: protocol ip \\ +# tc qdisc add dev eth0 handle ffff: clsact +# tc filter add dev eth0 ingress protocol ip \\ u32 match ip protocol 1 0xff \\ action mirred egress mirror dev dummy0 .EE @@ -87,13 +107,21 @@ interface, it is possible to send ingress traffic through an instance of # modprobe ifb # ip link set ifb0 up # tc qdisc add dev ifb0 root sfq -# tc qdisc add dev eth0 handle ffff: ingress -# tc filter add dev eth0 parent ffff: u32 \\ +# tc qdisc add dev eth0 handle ffff: clsact +# tc filter add dev eth0 ingress u32 \\ match u32 0 0 \\ action mirred egress redirect dev ifb0 .EE .RE +.SH LIMITATIONS +The kernel restricts nesting to four levels to avoid the chance +of nesting loops. +.PP +Do not redirect for one IFB device to another. +IFB is a very specialized case of packet redirecting device. +Redirecting from ifbX->ifbY will cause all packets to be dropped. + .SH SEE ALSO .BR tc (8), .BR tc-u32 (8) diff --git a/upstream/debian-bookworm/man8/tc-pfifo_fast.8 b/upstream/debian-bookworm/man8/tc-pfifo_fast.8 index baf34b1d..0029d67f 100644 --- a/upstream/debian-bookworm/man8/tc-pfifo_fast.8 +++ b/upstream/debian-bookworm/man8/tc-pfifo_fast.8 @@ -27,8 +27,6 @@ have traffic, higher bands are never dequeued. This can be used to prioritize interactive traffic or penalize 'lowest cost' traffic. Each band can be txqueuelen packets long, as configured with -.BR ifconfig (8) -or .BR ip (8). Additional packets coming in are not enqueued but are instead dropped. @@ -40,8 +38,6 @@ for complete details on how TOS bits are translated into bands. txqueuelen The length of the three bands depends on the interface txqueuelen, as specified with -.BR ifconfig (8) -or .BR ip (8). .SH BUGS diff --git a/upstream/debian-bookworm/man8/tc-sfb.8 b/upstream/debian-bookworm/man8/tc-sfb.8 index e4584deb..1f2b8c5e 100644 --- a/upstream/debian-bookworm/man8/tc-sfb.8 +++ b/upstream/debian-bookworm/man8/tc-sfb.8 @@ -67,7 +67,7 @@ the number of non-responsive flows, M. It is (1 - (1 - (1 / 16.0)) ** M) **8, so for example with 10 non-responsive flows approximately 0.2% of responsive flows will be misidentified. -To mitigate this, SFB performs performs periodic re-hashing to avoid +To mitigate this, SFB performs periodic re-hashing to avoid misclassification for prolonged periods of time. The default hashing method will use source and destination ip addresses and port numbers diff --git a/upstream/debian-bookworm/man8/tc-simple.8 b/upstream/debian-bookworm/man8/tc-simple.8 index f565755e..ae1aec31 100644 --- a/upstream/debian-bookworm/man8/tc-simple.8 +++ b/upstream/debian-bookworm/man8/tc-simple.8 @@ -55,11 +55,11 @@ grep the logs to see the logged message display stats again and observe increment by 1 .EX - hadi@noma1:$ tc qdisc add dev eth0 ingress - hadi@noma1:$tc filter add dev eth0 parent ffff: protocol ip prio 5 \\ + $ tc qdisc add dev eth0 ingress + $ tc filter add dev eth0 parent ffff: protocol ip prio 5 \\ u32 match ip protocol 1 0xff flowid 1:1 action simple sdata "Incoming ICMP" - hadi@noma1:$ sudo tc -s filter ls dev eth0 parent ffff: + $ sudo tc -s filter ls dev eth0 parent ffff: filter protocol ip pref 5 u32 filter protocol ip pref 5 u32 fh 800: ht divisor 1 filter protocol ip pref 5 u32 fh 800::800 order 2048 key ht 800 bkt 0 flowid 1:1 @@ -71,7 +71,7 @@ display stats again and observe increment by 1 backlog 0b 0p requeues 0 - hadi@noma1$ ping -c 1 www.google.ca + $ ping -c 1 www.google.ca PING www.google.ca (74.125.225.120) 56(84) bytes of data. 64 bytes from ord08s08-in-f24.1e100.net (74.125.225.120): icmp_req=1 ttl=53 time=31.3 ms @@ -79,10 +79,10 @@ display stats again and observe increment by 1 1 packets transmitted, 1 received, 0% packet loss, time 0ms rtt min/avg/max/mdev = 31.316/31.316/31.316/0.000 ms - hadi@noma1$ dmesg | grep simple + $ dmesg | grep simple [135354.473951] simple: Incoming ICMP_1 - hadi@noma1$ sudo tc/tc -s filter ls dev eth0 parent ffff: + $ sudo tc/tc -s filter ls dev eth0 parent ffff: filter protocol ip pref 5 u32 filter protocol ip pref 5 u32 fh 800: ht divisor 1 filter protocol ip pref 5 u32 fh 800::800 order 2048 key ht 800 bkt 0 flowid 1:1 diff --git a/upstream/debian-bookworm/man8/tc-xt.8 b/upstream/debian-bookworm/man8/tc-xt.8 deleted file mode 100644 index f6dc5add..00000000 --- a/upstream/debian-bookworm/man8/tc-xt.8 +++ /dev/null @@ -1,42 +0,0 @@ -.TH "iptables action in tc" 8 "3 Mar 2016" "iproute2" "Linux" - -.SH NAME -xt - tc iptables action -.SH SYNOPSIS -.in +8 -.ti -8 -.BR tc " ... " "action xt \-j" -.IR TARGET " [ " TARGET_OPTS " ]" -.SH DESCRIPTION -The -.B xt -action allows one to call arbitrary iptables targets for packets matching the filter -this action is attached to. -.SH OPTIONS -.TP -.BI -j " TARGET \fR[\fI TARGET_OPTS \fR]" -Perform a jump to the given iptables target, optionally passing any target -specific options in -.IR TARGET_OPTS . -.SH EXAMPLES -The following will attach a -.B u32 -filter to the -.B ingress -qdisc matching ICMP replies and using the -.B xt -action to make the kernel yell 'PONG' each time: - -.RS -.EX -tc qdisc add dev eth0 ingress -tc filter add dev eth0 parent ffff: proto ip u32 \\ - match ip protocol 1 0xff \\ - match ip icmp_type 0 0xff \\ - action xt -j LOG --log-prefix PONG -.EE -.RE -.SH SEE ALSO -.BR tc (8), -.BR tc-u32 (8), -.BR iptables-extensions (8) diff --git a/upstream/debian-bookworm/man8/tc.8 b/upstream/debian-bookworm/man8/tc.8 index e5bef911..dce58af1 100644 --- a/upstream/debian-bookworm/man8/tc.8 +++ b/upstream/debian-bookworm/man8/tc.8 @@ -127,7 +127,7 @@ tc \- show / manipulate traffic control settings \fB[ \fB-nm \fR| \fB-nam\fR[\fIes\fR] \fB] \fR| \fB[ \fR{ \fB-cf \fR| \fB-c\fR[\fIonf\fR] \fR} \fB[ filename ] \fB] \fR \fB[ -t\fR[imestamp\fR] \fB\] \fR| \fB[ -t\fR[short\fR] \fR| \fB[ --o\fR[neline\fR] \fB]\fR } +-o\fR[neline\fR] \fB] \fR| \fB[ -echo ]\fR } .ti 8 .IR FORMAT " := {" @@ -743,6 +743,10 @@ When\fB\ tc monitor\fR\ runs, print timestamp before the event message in format When\fB\ tc monitor\fR\ runs, prints short timestamp before the event message in format: [<YYYY>-<MM>-<DD>T<hh:mm:ss>.<ms>] +.TP +.BR "\-echo" +Request the kernel to send the applied configuration back. + .SH FORMAT The show command has additional formatting options: @@ -871,6 +875,7 @@ was written by Alexey N. Kuznetsov and added in Linux 2.2. .BR tc-fq_codel (8), .BR tc-fq_pie (8), .BR tc-fw (8), +.BR tc-gact (8), .BR tc-hfsc (7), .BR tc-hfsc (8), .BR tc-htb (8), diff --git a/upstream/debian-bookworm/man8/tipc-nametable.8 b/upstream/debian-bookworm/man8/tipc-nametable.8 index b187d25e..f7c51f19 100644 --- a/upstream/debian-bookworm/man8/tipc-nametable.8 +++ b/upstream/debian-bookworm/man8/tipc-nametable.8 @@ -49,13 +49,13 @@ provided by a port. .B Lower .br The lower bound of the 32-bit instance field of the port name. -The instance field is often used as as a sub-class indicator. +The instance field is often used as a sub-class indicator. .TP .B Upper .br The upper bound of the 32-bit instance field of the port name. -The instance field is often used as as a sub-class indicator. +The instance field is often used as a sub-class indicator. A difference in .BR "lower " "and " upper means the socket is bound to the port name range [lower,upper] diff --git a/upstream/debian-bookworm/man8/tune2fs.8 b/upstream/debian-bookworm/man8/tune2fs.8 index 4b9d77af..c65aa178 100644 --- a/upstream/debian-bookworm/man8/tune2fs.8 +++ b/upstream/debian-bookworm/man8/tune2fs.8 @@ -2,7 +2,7 @@ .\" Initial revision .\" .\" -.TH TUNE2FS 8 "February 2023" "E2fsprogs version 1.47.0" +.TH TUNE2FS 8 "May 2024" "E2fsprogs version 1.47.1-rc2" .SH NAME tune2fs \- adjust tunable file system parameters on ext2/ext3/ext4 file systems .SH SYNOPSIS diff --git a/upstream/debian-bookworm/man8/uuidd.8 b/upstream/debian-bookworm/man8/uuidd.8 index 2cd45913..24adb660 100644 --- a/upstream/debian-bookworm/man8/uuidd.8 +++ b/upstream/debian-bookworm/man8/uuidd.8 @@ -2,12 +2,12 @@ .\" Title: uuidd .\" Author: [see the "AUTHOR(S)" section] .\" Generator: Asciidoctor 2.0.18 -.\" Date: 2023-03-23 +.\" Date: 2024-03-28 .\" Manual: System Administration .\" Source: util-linux 2.38.1 .\" Language: English .\" -.TH "UUIDD" "8" "2023-03-23" "util\-linux 2.38.1" "System Administration" +.TH "UUIDD" "8" "2024-03-28" "util\-linux 2.38.1" "System Administration" .ie \n(.g .ds Aq \(aq .el .ds Aq ' .ss \n[.ss] 0 |