Skip to content

Commit cdd4163

Browse files
committed
Bump to version 2.1.0
1 parent e05f88a commit cdd4163

9 files changed

+44
-49
lines changed

bin/generate-zbm

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use strict;
55
use warnings;
66

7-
our $VERSION = '2.0.0';
7+
our $VERSION = '2.1.0';
88

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

docs/man/generate-zbm.5

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
1+
.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.43)
22
.\"
33
.\" Standard preamble:
44
.\" ========================================================================
@@ -133,7 +133,7 @@
133133
.\" ========================================================================
134134
.\"
135135
.IX Title "generate-zbm 5"
136-
.TH generate-zbm 5 "2022-06-24" "2.0.0" "config.yaml"
136+
.TH generate-zbm 5 "2022-12-19" "2.1.0" "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
@@ -171,7 +171,7 @@ A single path or an array of paths to \fBmkinitcpio\fR hook directories. When sp
171171
In general, this should be the location of your \s-1EFI\s0 System Partition. \fBgenerate-zbm\fR will ensure that this is mounted when images are created and, if \fBgenerate-zbm\fR does the mounting, will unmount this filesystem on exit. When this parameter is not specified, \fBgenerate-zbm\fR will not verify or attempt to mount any filesystems.
172172
.IP "\fBVersion\fR" 4
173173
.IX Item "Version"
174-
A specific ZFSBootMenu version string to use in producing images. In the string, the value \fI%{current}\fR will be replaced with the release version of ZFSBootMenu. The default value is simply \fI%{current}\fR.
174+
A specific ZFSBootMenu version string to use in versioned output images. In the string, the value \fI%{current}\fR will be replaced with the release version of ZFSBootMenu. The default value is simply \fI%{current}\fR.
175175
.IP "\fBDracutFlags\fR" 4
176176
.IX Item "DracutFlags"
177177
An array of additional arguments that will be passed to \fBdracut\fR when generating an initramfs. This option is ignored when \fIGlobal.InitCPIO\fR is \fItrue\fR.

docs/man/generate-zbm.8

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
1+
.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.43)
22
.\"
33
.\" Standard preamble:
44
.\" ========================================================================
@@ -133,7 +133,7 @@
133133
.\" ========================================================================
134134
.\"
135135
.IX Title "generate-zbm 8"
136-
.TH generate-zbm 8 "2022-06-28" "2.0.0" "generate-zbm"
136+
.TH generate-zbm 8 "2022-12-20" "2.1.0" "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
@@ -148,7 +148,7 @@ generate\-zbm \- ZFSBootMenu initramfs generator
148148
Where noted, command-line options supersede options in the \fBgenerate-zbm\fR(5) configuration file.
149149
.IP "\fB\-\-version|\-v\fR \fIzbm-version\fR" 4
150150
.IX Item "--version|-v zbm-version"
151-
Override the ZFSBootMenu version; supersedes \fIGlobal.Version\fR
151+
Override the ZFSBootMenu version in output files; supersedes \fIGlobal.Version\fR
152152
.IP "\fB\-\-kernel|\-k\fR \fIkernel-path\fR" 4
153153
.IX Item "--kernel|-k kernel-path"
154154
Manually specify a specific kernel; supersedes \fIKernel.Path\fR
@@ -160,7 +160,10 @@ Manually specify a specific kernel version; supersedes \fIKernel.Version\fR
160160
Manually specify the output image prefix; supersedes \fIKernel.Prefix\fR
161161
.IP "\fB\-\-initcpio|\-i\fR" 4
162162
.IX Item "--initcpio|-i"
163-
Use mkinitcpio instead of dracut.
163+
Force the use of mkinitcpio instead of dracut.
164+
.IP "\fB\-\-no\-initcpio|\-i\fR" 4
165+
.IX Item "--no-initcpio|-i"
166+
Force the use of dracut instead of mkinitcpio.
164167
.IP "\fB\-\-confd|\-C\fR \fIconfig-path\fR" 4
165168
.IX Item "--confd|-C config-path"
166169
Specify initramfs configuration path
@@ -197,6 +200,9 @@ Set the \fIGlobal.ManageImages\fR option to false, disabling image generation.
197200
.IP "\fB\-\-debug|d\fR" 4
198201
.IX Item "--debug|d"
199202
Enable debug output
203+
.IP "\fB\-\-showver|V\fR" 4
204+
.IX Item "--showver|V"
205+
Print ZFSBootMenu version and quit.
200206
.SH "SEE ALSO"
201207
.IX Header "SEE ALSO"
202208
\&\fBgenerate-zbm\fR(5) \fBzfsbootmenu\fR(7)

docs/man/zbm-efi-kcl.8

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
1+
.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.43)
22
.\"
33
.\" Standard preamble:
44
.\" ========================================================================
@@ -133,7 +133,7 @@
133133
.\" ========================================================================
134134
.\"
135135
.IX Title "zbm-efi-kcl 8"
136-
.TH zbm-efi-kcl 8 "2022-06-27" "2.0.0" "zbm-efi-kcl"
136+
.TH zbm-efi-kcl 8 "2022-07-11" "2.1.0" "zbm-efi-kcl"
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

docs/man/zbm-kcl.8

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
1+
.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.43)
22
.\"
33
.\" Standard preamble:
44
.\" ========================================================================
@@ -133,7 +133,7 @@
133133
.\" ========================================================================
134134
.\"
135135
.IX Title "zbm-kcl 8"
136-
.TH zbm-kcl 8 "2022-06-24" "2.0.0" "zbm-kcl"
136+
.TH zbm-kcl 8 "2022-07-11" "2.1.0" "zbm-kcl"
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

docs/man/zfsbootmenu.7

+3-5
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
.\" ========================================================================
134134
.\"
135135
.IX Title "zfsbootmenu 7"
136-
.TH zfsbootmenu 7 "2022-10-28" "2.0.0" "ZFSBootMenu"
136+
.TH zfsbootmenu 7 "2022-12-19" "2.1.0" "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
@@ -174,7 +174,7 @@ This option controls how the pool import process should take place.
174174
.RS 4
175175
.IP "\fBzbm.import_policy=hostid\fR" 2
176176
.IX Item "zbm.import_policy=hostid"
177-
Set this option to allow run-time reconfiguration of the \s-1SPL\s0 hostid. If a pool is preferred via \fBzbm.prefer\fR and the pool can not be imported with a preconfigured hostid, the system will attempt to adopt the hostid of the system that last imported the pool. If a preferred pool is not set and no pools can be imported using a preconfigured hostid, the system will adopt the hostid of the first otherwise-importable pool. After adopting a detected hostid, ZFSBootMenu will subsequently attempt to import as many pools as possible. This option is forbidden on big-endian systems. This is the default import policy.
177+
Set this option to allow run-time reconfiguration of the \s-1SPL\s0 hostid. If a pool is preferred via \fBzbm.prefer\fR and the pool can not be imported with a preconfigured hostid, the system will attempt to adopt the hostid of the system that last imported the pool. If a preferred pool is not set and no pools can be imported using a preconfigured hostid, the system will adopt the hostid of the first otherwise-importable pool. After adopting a detected hostid, ZFSBootMenu will subsequently attempt to import as many pools as possible. This is the default import policy.
178178
.IP "\fBzbm.import_policy=strict\fR" 2
179179
.IX Item "zbm.import_policy=strict"
180180
Set this option to only import pools that match the \s-1SPL\s0 hostid configured in ZFSBootMenu. If none can be imported, an emergency shell will be invoked. The \fIstrict\fR policy is consistent with the behavior of earlier versions of ZFSBootMenu.
@@ -186,9 +186,7 @@ Set this option to attempt to force pool imports. When set, this invokes \fIzpoo
186186
.RE
187187
.IP "\fBzbm.set_hostid\fR" 4
188188
.IX Item "zbm.set_hostid"
189-
On little-endian systems, setting this option will cause ZFSBootMenu to set the \fIspl.spl_hostid\fR command-line parameter for the selected boot environment to the hostid used to import its pool. The \s-1SPL\s0 kernel module will use this value as the hostid of the booted environment regardless of the contents of \fI/etc/hostid\fR. As a special case, if the hostid to be set is zero, ZFSBootMenu will instead set \fIspl_hostid=00000000\fR, which should be used by dracut-based initramfs images to write an all-zero \fI/etc/hostid\fR in the initramfs prior to importing the boot pool. This option is on by default.
190-
.Sp
191-
This option has no effect on big-endian systems.
189+
Setting this option will cause ZFSBootMenu to set the \fIspl.spl_hostid\fR command-line parameter for the selected boot environment to the hostid used to import its pool. The \s-1SPL\s0 kernel module will use this value as the hostid of the booted environment regardless of the contents of \fI/etc/hostid\fR. As a special case, if the hostid to be set is zero, ZFSBootMenu will instead set \fIspl_hostid=00000000\fR, which should be used by dracut-based initramfs images to write an all-zero \fI/etc/hostid\fR in the initramfs prior to importing the boot pool. This option is on by default.
192190
.Sp
193191
\&\fBNote:\fR Setting \fIspl.spl_hostid\fR to a non-zero value on the kernel commandline will make the \s-1ZFS\s0 kernel modules \fBignore\fR any value set in \fI/etc/hostid\fR. To restore standard \s-1ZFS\s0 behavior on a running system, execute
194192
.Sp

zfsbootmenu/help-files/132/zfsbootmenu.7.pod

+6-8
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ general systems to boot without setting any values.
4646
not be imported with a preconfigured hostid, the system will attempt to adopt the hostid of the system that last imported the
4747
pool. If a preferred pool is not set and no pools can be imported using a preconfigured hostid, the system will adopt the
4848
hostid of the first otherwise-importable pool. After adopting a detected hostid, ZFSBootMenu will subsequently attempt to
49-
import as many pools as possible. This option is forbidden on big-endian systems. This is the default import policy.
49+
import as many pools as possible. This is the default import policy.
5050

5151
zbm.import_policy=strict
5252
Set this option to only import pools that match the SPL hostid configured in ZFSBootMenu. If none can be imported, an
@@ -57,13 +57,11 @@ general systems to boot without setting any values.
5757
command, which will attempt to import a pool that's potentially in use on another system. Use this option with caution!
5858

5959
zbm.set_hostid
60-
On little-endian systems, setting this option will cause ZFSBootMenu to set the spl.spl_hostid command-line parameter for the
61-
selected boot environment to the hostid used to import its pool. The SPL kernel module will use this value as the hostid of the
62-
booted environment regardless of the contents of /etc/hostid. As a special case, if the hostid to be set is zero, ZFSBootMenu
63-
will instead set spl_hostid=00000000, which should be used by dracut-based initramfs images to write an all-zero /etc/hostid in
64-
the initramfs prior to importing the boot pool. This option is on by default.
65-
66-
This option has no effect on big-endian systems.
60+
Setting this option will cause ZFSBootMenu to set the spl.spl_hostid command-line parameter for the selected boot environment to
61+
the hostid used to import its pool. The SPL kernel module will use this value as the hostid of the booted environment regardless
62+
of the contents of /etc/hostid. As a special case, if the hostid to be set is zero, ZFSBootMenu will instead set
63+
spl_hostid=00000000, which should be used by dracut-based initramfs images to write an all-zero /etc/hostid in the initramfs
64+
prior to importing the boot pool. This option is on by default.
6765

6866
Note: Setting spl.spl_hostid to a non-zero value on the kernel commandline will make the ZFS kernel modules ignore any value set
6967
in /etc/hostid. To restore standard ZFS behavior on a running system, execute

zfsbootmenu/help-files/52/zfsbootmenu.7.pod

+9-13
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ without setting any values.
7777
otherwise-importable pool. After adopting a
7878
detected hostid, ZFSBootMenu will subsequently
7979
attempt to import as many pools as possible.
80-
This option is forbidden on big-endian
81-
systems. This is the default import policy.
80+
This is the default import policy.
8281

8382
zbm.import_policy=strict
8483
Set this option to only import pools that
@@ -97,23 +96,20 @@ without setting any values.
9796
Use this option with caution!
9897

9998
zbm.set_hostid
100-
On little-endian systems, setting this option
101-
will cause ZFSBootMenu to set the spl.spl_hostid
102-
command-line parameter for the selected boot
103-
environment to the hostid used to import its
104-
pool. The SPL kernel module will use this value
105-
as the hostid of the booted environment
106-
regardless of the contents of /etc/hostid. As a
107-
special case, if the hostid to be set is zero,
108-
ZFSBootMenu will instead set
99+
Setting this option will cause ZFSBootMenu to
100+
set the spl.spl_hostid command-line parameter
101+
for the selected boot environment to the hostid
102+
used to import its pool. The SPL kernel module
103+
will use this value as the hostid of the booted
104+
environment regardless of the contents of
105+
/etc/hostid. As a special case, if the hostid to
106+
be set is zero, ZFSBootMenu will instead set
109107
spl_hostid=00000000, which should be used by
110108
dracut-based initramfs images to write an
111109
all-zero /etc/hostid in the initramfs prior to
112110
importing the boot pool. This option is on by
113111
default.
114112

115-
This option has no effect on big-endian systems.
116-
117113
Note: Setting spl.spl_hostid to a non-zero value
118114
on the kernel commandline will make the ZFS
119115
kernel modules ignore any value set in

zfsbootmenu/help-files/92/zfsbootmenu.7.pod

+8-11
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ Default options were chosen to allow general systems to boot without setting any
5353
If a preferred pool is not set and no pools can be imported using a preconfigured
5454
hostid, the system will adopt the hostid of the first otherwise-importable pool. After
5555
adopting a detected hostid, ZFSBootMenu will subsequently attempt to import as many
56-
pools as possible. This option is forbidden on big-endian systems. This is the default
57-
import policy.
56+
pools as possible. This is the default import policy.
5857

5958
zbm.import_policy=strict
6059
Set this option to only import pools that match the SPL hostid configured in
@@ -67,15 +66,13 @@ Default options were chosen to allow general systems to boot without setting any
6766
that's potentially in use on another system. Use this option with caution!
6867

6968
zbm.set_hostid
70-
On little-endian systems, setting this option will cause ZFSBootMenu to set the
71-
spl.spl_hostid command-line parameter for the selected boot environment to the hostid
72-
used to import its pool. The SPL kernel module will use this value as the hostid of the
73-
booted environment regardless of the contents of /etc/hostid. As a special case, if the
74-
hostid to be set is zero, ZFSBootMenu will instead set spl_hostid=00000000, which should
75-
be used by dracut-based initramfs images to write an all-zero /etc/hostid in the
76-
initramfs prior to importing the boot pool. This option is on by default.
77-
78-
This option has no effect on big-endian systems.
69+
Setting this option will cause ZFSBootMenu to set the spl.spl_hostid command-line
70+
parameter for the selected boot environment to the hostid used to import its pool. The
71+
SPL kernel module will use this value as the hostid of the booted environment regardless
72+
of the contents of /etc/hostid. As a special case, if the hostid to be set is zero,
73+
ZFSBootMenu will instead set spl_hostid=00000000, which should be used by dracut-based
74+
initramfs images to write an all-zero /etc/hostid in the initramfs prior to importing
75+
the boot pool. This option is on by default.
7976

8077
Note: Setting spl.spl_hostid to a non-zero value on the kernel commandline will make the
8178
ZFS kernel modules ignore any value set in /etc/hostid. To restore standard ZFS behavior

0 commit comments

Comments
 (0)