Skip to content

Commit ac8a8ed

Browse files
committed
Bump to version 1.8.1
1 parent 1853ef7 commit ac8a8ed

File tree

5 files changed

+50
-18
lines changed

5 files changed

+50
-18
lines changed

CHANGELOG.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,28 @@
1+
# ZFSBootMenu v1.8.1 (2021-01-12)
2+
3+
Happy New Year! ZFSBootMenu 1.8.1 provides a few minor enhancements and bug fixes.
4+
5+
## Fixes
6+
* Properly handle encryption keys as raw devices rather than normal files. (#127)
7+
* Improve detection of latest kernels when `/boot` contains some unversioned kernel files. (#128)
8+
* Accept `Ctrl` and `Ctrl-Alt` as hotkey modifiers in addition to `Alt` to fix issues with some non-US keymaps. (#124)
9+
* Everywhere a chroot hotkey is offered, use the same hotkey.
10+
11+
## New features
12+
* Add hard wraps to the hotkey menus to improve clarity; ignored for small screens.
13+
* In the snapshot list, add an option to jump into a read-only chroot for that snapshot.
14+
* The `force_import` and `timeout` kernel command-line options are now expected to be `zbm.force_import` and `zbm.timeout`; the old forms are deprecated but will continue to work for the forseeable future.
15+
* New `zbm.show` and `zbm.skip` command-line options force the menu to appear or be skipped if `zbm.timeout` is not also set.
16+
17+
## Significant commits in this release
18+
* ab95346 - Expect names of the form <prefix>-<version> when finding latest kernel (Andrew J. Hesford)
19+
* 798fce8 - Normalize tests for paths. (Andrew J. Hesford)
20+
* d02865e - Change chroot keys, add help text (#126) (Zach Dykstra)
21+
* 83c58b2 - Support Ctrl and Ctrl-Alt in addition to Alt as keybind modifiers (Andrew J. Hesford)
22+
* 70c3d70 - Namespace our KCL args, organize parsing (#120) (Zach Dykstra)
23+
* c1d6ce5 - Support chroot'ing into a snapshot (Zach Dykstra)
24+
* 7a63beb - Support for hard wrap points in header_wrap (Andrew J. Hesford)
25+
126
# ZFSBootMenu v1.8.0 (2020-12-15)
227

328
ZFSBootMenu 1.8.0 offers a significant list of new features, fixes and general improvements.
@@ -434,3 +459,4 @@ Booting from a snapshot has been fixed - the snapshot is now correctly unmounted
434459
Initial release!
435460

436461
The dracut module has been built into an initramfs for both x86_64 and ppc64le (POWER8+) - with Linux 5.3.7. A sample grub.cfg is provided, demonstrating how to enter the boot menu. Update your pool name, and set spl_hostid based on the output of 'hostid' on your machine.
462+

bin/generate-zbm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use strict;
55
use warnings;
66

7-
our $VERSION = '1.8.0';
7+
our $VERSION = '1.8.1';
88

99
use Getopt::Long qw(:config no_ignore_case auto_version);
1010
use Pod::Usage qw(pod2usage);

man/generate-zbm.5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
.\" ========================================================================
134134
.\"
135135
.IX Title "generate-zbm 5"
136-
.TH generate-zbm 5 "2020-09-30" "1.8.0" "config.yaml"
136+
.TH generate-zbm 5 "2020-09-30" "1.8.1" "config.yaml"
137137
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
138138
.\" way too many mistakes in technical documents.
139139
.if n .ad l

man/generate-zbm.8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
.\" ========================================================================
134134
.\"
135135
.IX Title "generate-zbm 8"
136-
.TH generate-zbm 8 "2020-12-15" "1.8.0" "generate-zbm"
136+
.TH generate-zbm 8 "2021-01-06" "1.8.1" "generate-zbm"
137137
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
138138
.\" way too many mistakes in technical documents.
139139
.if n .ad l

man/zfsbootmenu.7

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
.\" ========================================================================
134134
.\"
135135
.IX Title "zfsbootmenu 7"
136-
.TH zfsbootmenu 7 "2020-12-10" "1.8.0" "ZFSBootMenu"
136+
.TH zfsbootmenu 7 "2020-12-21" "1.8.1" "ZFSBootMenu"
137137
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
138138
.\" way too many mistakes in technical documents.
139139
.if n .ad l
@@ -146,36 +146,42 @@ ZFSBootMenu behavior is controlled through \s-1ZFS\s0 filesystem properties and
146146
.SH "Command-Line Parameters"
147147
.IX Header "Command-Line Parameters"
148148
These options are set on the kernel command line when booting the initramfs or \s-1UEFI\s0 bundle. Default options were chosen to allow general systems to boot without setting any values.
149+
.IP "\fBroot=zfsbootmenu:POOL=<pool>\fR" 4
150+
.IX Item "root=zfsbootmenu:POOL=<pool>"
151+
By default, ZFSBootMenu will look for the \fIbootfs\fR property on the first pool it imports to select the default boot environment. If you have multiple pools, substitute the name of your preferred pool for \fB<pool>\fR in the argument \fBroot=zfsbootmenu:POOL=<pool>\fR.
149152
.IP "\fBspl_hostid=<hostid>\fR" 4
150153
.IX Item "spl_hostid=<hostid>"
151154
When creating an initramfs or \s-1UEFI\s0 bundle, the \fIhostid\fR from the system is copied into the target. If this image will be used on another system with a different \fIhostid\fR, it can be overridden with this option.
152155
.Sp
153156
Replace \fB<hostid>\fR with an eight-digit hexadecimal number.
154-
.IP "\fBforce_import=1\fR" 4
155-
.IX Item "force_import=1"
157+
.IP "\fBzbm.force_import=1\fR" 4
158+
.IX Item "zbm.force_import=1"
156159
Set this option to attempt to force pool imports. When set, this invokes \fIzpool import \-f\fR in place of the regular \fIzpool import\fR command, which will attempt to import a pool that's potentially in use on another system. Use this option with caution!
157160
.Sp
158-
Omit this option or explicitly specify \fBforce_import=0\fR to disable forced imports.
159-
.IP "\fBtimeout\fR" 4
160-
.IX Item "timeout"
161+
Omit this option or explicitly specify \fBzbm.force_import=0\fR to disable forced imports.
162+
.IP "\fBforce_import=1\fR" 4
163+
.IX Item "force_import=1"
164+
Deprecated; use \fBzbm.force_import\fR.
165+
.IP "\fBzbm.timeout\fR" 4
166+
.IX Item "zbm.timeout"
161167
This option accepts numeric values that control whether and when the
162168
boot-environment menu should be displayed.
163169
.RS 4
164-
.IP "\fBtimeout=0\fR" 2
165-
.IX Item "timeout=0"
170+
.IP "\fBzbm.timeout=0\fR | \fBzbm.skip\fR" 2
171+
.IX Item "zbm.timeout=0 | zbm.skip"
166172
When possible, bypass the menu and immediately boot a configured \fIbootfs\fR pool property.
167-
.IP "\fBtimeout=\-1\fR" 2
168-
.IX Item "timeout=-1"
173+
.IP "\fBzbm.timeout=\-1\fR | \fBzbm.show\fR" 2
174+
.IX Item "zbm.timeout=-1 | zbm.show"
169175
Rather than present a countdown timer for automatic selection, immediately display the boot-environment menu.
170-
.IP "\fBtimeout=<positive integer>\fR" 2
171-
.IX Item "timeout=<positive integer>"
176+
.IP "\fBzbm.timeout=<positive integer>\fR" 2
177+
.IX Item "zbm.timeout=<positive integer>"
172178
Display a countdown timer for the specified number of seconds before booting the configured \fIbootfs\fR boot environment.
173179
.RE
174180
.RS 4
175181
.RE
176-
.IP "\fBroot=zfsbootmenu:POOL=<pool>\fR" 4
177-
.IX Item "root=zfsbootmenu:POOL=<pool>"
178-
By default, ZFSBootMenu will look for the \fIbootfs\fR property on the first pool it imports to select the default boot environment. If you have multiple pools, substitute the name of your preferred pool for \fB<pool>\fR in the argument \fBroot=zfsbootmenu:POOL=<pool>\fR.
182+
.IP "\fBtimeout\fR" 4
183+
.IX Item "timeout"
184+
Deprecated; use \fBzbm.timeout\fR.
179185
.IP "\fBzbm.tmux\fR" 4
180186
.IX Item "zbm.tmux"
181187
Indicate that ZFSBootMenu should be run under \fBtmux\fR in the initramfs. With this enabled, debug-level logging for the ZFSBootMenu scripts can be easily viewed. The tooling must also be installed with an additional dracut configuration option listed below.

0 commit comments

Comments
 (0)