Merge branch 'v2.2.x'

zbm-dev · Oct 13, 2023 · 8c0182b · 8c0182b
2 parents 96ffd68 + d11cf27
commit 8c0182b
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 9 deletions.
diff --git a/bin/generate-zbm b/bin/generate-zbm
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '2.2.0';
+our $VERSION = '2.2.1';
 
 use Getopt::Long qw(:config no_ignore_case auto_version);
 use Pod::Usage qw(pod2usage);

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## ZFSBootMenu v2.2.1 (2023-10-13)
+
+ZFSBootMenu v2.2.1 offers a few minor bug fixes over the prior release. More significantly, the build-container images and release assets for this version include OpenZFS 2.2.0 to provide access to upgraded pools.
+
+All users of the binary releases or the ZFSBootMenu build container are encouraged to update to ZFSBootMenu v2.2.1 before upgrading any ZFS pools.
+
+### Significant commits in this release
+* e4102ee - zfs-chroot: load keys again after setting pool r/w (Zach Dykstra)
+* 7b3dcc1 - zfs-chroot: add read-write prompt (Zach Dykstra)
+* 09e4d76 - docs/man/zfsbootmenu: fix typo (Wesley H. Gimenes)
+* 7532d1f - zfsbootmenu: protect stdout of main interface (Zach Dykstra)
+* 6528649 - zfsbootmenu-help: use cat in place of less (Zach Dykstra)
+* bf20728 - zfsbootmenu: make 'less' an optional binary (Zach Dykstra)
+* d03f9de - Add dm-crypt to recovery images, so cryptsetup works (Andrew J. Hesford)
+* b212b23 - zbm-builder.sh: add mount-options argument, document use (Andrew Gunnerson)
+
 ## ZFSBootMenu v2.2.0 (2023-05-21)
 
 Perhaps the most significant change in ZFSBootMenu v2.2.0 is an overhaul of the project documentation. We are thrilled to welcome new member @classabbyamp to the project, who oversaw this substantial effort. Disparate documentation previously stored in Markdown files, the GitHub Wiki, POD files, and another git repository have now been combined into a single tree that is published on Read The Docs. The documentation is now maintained as an integral part of this repository and is published at https://docs.zfsbootmenu.org/. This includes:

diff --git a/docs/conf.py b/docs/conf.py
@@ -10,7 +10,7 @@
 author = 'ZFSBootMenu Team'
 man_author = f'{author} <https://github.com/zbm-dev/zfsbootmenu>'
 copyright = f'2019 Zach Dykstra, 2020-2023 {author}'
-release = '2.2.0'
+release = '2.2.1'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

diff --git a/docs/man/dist/man5/generate-zbm.5 b/docs/man/dist/man5/generate-zbm.5
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "GENERATE-ZBM" "5" "2023-05-21" "" "ZFSBootMenu"
+.TH "GENERATE-ZBM" "5" "2023-10-13" "" "ZFSBootMenu"
 .SH NAME
 generate-zbm \- configuration file for generate-zbm
 .SH SYNOPSIS

diff --git a/docs/man/dist/man7/zfsbootmenu.7 b/docs/man/dist/man7/zfsbootmenu.7
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "ZFSBOOTMENU" "7" "2023-09-16" "" "ZFSBootMenu"
+.TH "ZFSBOOTMENU" "7" "2023-10-13" "" "ZFSBootMenu"
 .SH NAME
 zfsbootmenu \- System Integration
 .SH SYNOPSIS
@@ -121,7 +121,7 @@ Setting \fIspl.spl_hostid\fP to a non\-zero value on the kernel commandline will
 .sp
 .nf
 .ft C
-echo 0 > /sys/module/spl/paramters/spl_hostid
+echo 0 > /sys/module/spl/parameters/spl_hostid
 .ft P
 .fi
 .UNINDENT

diff --git a/docs/man/dist/man8/generate-zbm.8 b/docs/man/dist/man8/generate-zbm.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "GENERATE-ZBM" "8" "2023-05-21" "" "ZFSBootMenu"
+.TH "GENERATE-ZBM" "8" "2023-10-13" "" "ZFSBootMenu"
 .SH NAME
 generate-zbm \- ZFSBootMenu initramfs generator
 .SH SYNOPSIS

diff --git a/docs/man/dist/man8/zbm-kcl.8 b/docs/man/dist/man8/zbm-kcl.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "ZBM-KCL" "8" "2023-05-21" "" "ZFSBootMenu"
+.TH "ZBM-KCL" "8" "2023-10-13" "" "ZFSBootMenu"
 .SH NAME
 zbm-kcl \- manipulate kernel command lines for boot environments and EFI executables
 .SH SYNOPSIS

diff --git a/releng/tag-release.sh b/releng/tag-release.sh
@@ -24,7 +24,8 @@ if [ ! -e bin/generate-zbm ] || [ ! -e docs/CHANGELOG.md ]; then
 fi
 
 # Only tag releases from master or a compatible release-tracking branch
-case "$(git rev-parse --abbrev-ref HEAD)" in
+release_branch="$(git rev-parse --abbrev-ref HEAD)" || release_branch=""
+case "${release_branch}" in
   master)
     echo "Tagging release from master branch"
     ;;
@@ -190,7 +191,8 @@ if ! git push; then
 fi
 
 if ! gh release create "${tag}" "${prerelease[@]}" \
-    -F "${relnotes}" -t "ZFSBootMenu ${tag}" "${asset_files[@]}"; then
+    --target "${release_branch}" -F "${relnotes}" \
+    -t "ZFSBootMenu ${tag}" "${asset_files[@]}"; then
   error "ERROR: release creation failed"
 fi