Skip to content

Commit 8dff320

Browse files
authored
Merge pull request #1022 from cgwalters/release
Release 1.1.4
2 parents 88a1273 + 7ee23e3 commit 8dff320

17 files changed

+159
-152
lines changed

Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/src/man/bootc-container-lint.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ part of a build process; it will error if any problems are detected.
2323

2424
# VERSION
2525

26-
v1.1.3
26+
v1.1.4

docs/src/man/bootc-container.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ bootc-container-help(8)
3030

3131
# VERSION
3232

33-
v1.1.3
33+
v1.1.4

docs/src/man/bootc-edit.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ Only changes to the \`spec\` section are honored.
3636

3737
# VERSION
3838

39-
v1.1.3
39+
v1.1.4

docs/src/man/bootc-install-ensure-completion.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ your code is using \`bootc install to-filesystem\` from the start.
2727

2828
# VERSION
2929

30-
v1.1.3
30+
v1.1.4

docs/src/man/bootc-install-print-configuration.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ string-valued filesystem name suitable for passing to \`mkfs.\$type\`.
2727

2828
# VERSION
2929

30-
v1.1.3
30+
v1.1.4

docs/src/man/bootc-install-to-disk.md

+36-34
Original file line numberDiff line numberDiff line change
@@ -36,35 +36,36 @@ more complex such as RAID, LVM, LUKS etc.
3636

3737
: Target root block device setup.
3838

39-
direct: Filesystem written directly to block device tpm2-luks: Bind
40-
unlock of filesystem to presence of the default tpm2 device.\
39+
direct: Filesystem written directly to block device tpm2-luks: Bind
40+
unlock of filesystem to presence of the default tpm2 device.\
4141

42-
\
43-
\[*possible values: *direct, tpm2-luks\]
42+
\
43+
\[*possible values: *direct, tpm2-luks\]
4444

4545
**\--filesystem**=*FILESYSTEM*
4646

4747
: Target root filesystem type\
4848

49-
\
50-
\[*possible values: *xfs, ext4, btrfs\]
49+
\
50+
\[*possible values: *xfs, ext4, btrfs\]
5151

5252
**\--root-size**=*ROOT_SIZE*
5353

5454
: Size of the root partition (default specifier: M). Allowed
5555
specifiers: M (mebibytes), G (gibibytes), T (tebibytes).
5656

57-
By default, all remaining space on the disk will be used.
57+
By default, all remaining space on the disk will be used.
5858

5959
**\--source-imgref**=*SOURCE_IMGREF*
6060

6161
: Install the system from an explicitly given source.
6262

63-
By default, bootc install and install-to-filesystem assumes that it runs
64-
in a podman container, and it takes the container image to install from
65-
the podmans container registry. If \--source-imgref is given, bootc uses
66-
it as the installation source, instead of the behaviour explained in the
67-
previous paragraph. See skopeo(1) for accepted formats.
63+
By default, bootc install and install-to-filesystem assumes that it
64+
runs in a podman container, and it takes the container image to
65+
install from the podmans container registry. If \--source-imgref is
66+
given, bootc uses it as the installation source, instead of the
67+
behaviour explained in the previous paragraph. See skopeo(1) for
68+
accepted formats.
6869

6970
**\--target-transport**=*TARGET_TRANSPORT* \[default: registry\]
7071

@@ -93,55 +94,56 @@ previous paragraph. See skopeo(1) for accepted formats.
9394
suppresses the check; use this when you know the issues it might
9495
find are addressed.
9596

96-
A common reason this may fail is when one is using an image which
97-
requires registry authentication, but not embedding the pull secret in
98-
the image so that updates can be fetched by the installed OS \"day 2\".
97+
A common reason this may fail is when one is using an image which
98+
requires registry authentication, but not embedding the pull secret
99+
in the image so that updates can be fetched by the installed OS
100+
\"day 2\".
99101

100102
**\--disable-selinux**
101103

102104
: Disable SELinux in the target (installed) system.
103105

104-
This is currently necessary to install \*from\* a system with SELinux
105-
disabled but where the target does have SELinux enabled.
106+
This is currently necessary to install \*from\* a system with
107+
SELinux disabled but where the target does have SELinux enabled.
106108

107109
**\--karg**=*KARG*
108110

109111
: Add a kernel argument. This option can be provided multiple times.
110112

111-
Example: \--karg=nosmt \--karg=console=ttyS0,114800n8
113+
Example: \--karg=nosmt \--karg=console=ttyS0,114800n8
112114

113115
**\--root-ssh-authorized-keys**=*ROOT_SSH_AUTHORIZED_KEYS*
114116

115117
: The path to an \`authorized_keys\` that will be injected into the
116118
\`root\` account.
117119

118-
The implementation of this uses systemd \`tmpfiles.d\`, writing to a
119-
file named \`/etc/tmpfiles.d/bootc-root-ssh.conf\`. This will have the
120-
effect that by default, the SSH credentials will be set if not present.
121-
The intention behind this is to allow mounting the whole \`/root\` home
122-
directory as a \`tmpfs\`, while still getting the SSH key replaced on
123-
boot.
120+
The implementation of this uses systemd \`tmpfiles.d\`, writing to a
121+
file named \`/etc/tmpfiles.d/bootc-root-ssh.conf\`. This will have
122+
the effect that by default, the SSH credentials will be set if not
123+
present. The intention behind this is to allow mounting the whole
124+
\`/root\` home directory as a \`tmpfs\`, while still getting the SSH
125+
key replaced on boot.
124126

125127
**\--generic-image**
126128

127129
: Perform configuration changes suitable for a \"generic\" disk image.
128130
At the moment:
129131

130-
\- All bootloader types will be installed - Changes to the system
131-
firmware will be skipped
132+
\- All bootloader types will be installed - Changes to the system
133+
firmware will be skipped
132134

133135
**\--bound-images**=*BOUND_IMAGES* \[default: stored\]
134136

135137
: How should logically bound images be retrieved\
136138

137-
\
138-
*Possible values:*
139+
\
140+
*Possible values:*
139141

140-
> - stored: Bound images must exist in the sources root container
141-
> storage (default)
142-
>
143-
> - pull: Bound images will be pulled and stored directly in the
144-
> targets bootc container storage
142+
- stored: Bound images must exist in the sources root container
143+
storage (default)
144+
145+
- pull: Bound images will be pulled and stored directly in the
146+
targets bootc container storage
145147

146148
**\--stateroot**=*STATEROOT*
147149

@@ -162,4 +164,4 @@ firmware will be skipped
162164

163165
# VERSION
164166

165-
v1.1.3
167+
v1.1.4

docs/src/man/bootc-install-to-existing-root.md

+40-38
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,28 @@ cleaned up if desired when rebooted into the new root.
3030

3131
: Configure how existing data is treated\
3232

33-
\
34-
*Possible values:*
35-
36-
> - wipe: Completely wipe the contents of the target filesystem. This
37-
> cannot be done if the target filesystem is the one the system is
38-
> booted from
39-
>
40-
> - alongside: This is a destructive operation in the sense that the
41-
> bootloader state will have its contents wiped and replaced.
42-
> However, the running system (and all files) will remain in place
43-
> until reboot
33+
\
34+
*Possible values:*
35+
36+
- wipe: Completely wipe the contents of the target filesystem.
37+
This cannot be done if the target filesystem is the one the
38+
system is booted from
39+
40+
- alongside: This is a destructive operation in the sense that the
41+
bootloader state will have its contents wiped and replaced.
42+
However, the running system (and all files) will remain in place
43+
until reboot
4444

4545
**\--source-imgref**=*SOURCE_IMGREF*
4646

4747
: Install the system from an explicitly given source.
4848

49-
By default, bootc install and install-to-filesystem assumes that it runs
50-
in a podman container, and it takes the container image to install from
51-
the podmans container registry. If \--source-imgref is given, bootc uses
52-
it as the installation source, instead of the behaviour explained in the
53-
previous paragraph. See skopeo(1) for accepted formats.
49+
By default, bootc install and install-to-filesystem assumes that it
50+
runs in a podman container, and it takes the container image to
51+
install from the podmans container registry. If \--source-imgref is
52+
given, bootc uses it as the installation source, instead of the
53+
behaviour explained in the previous paragraph. See skopeo(1) for
54+
accepted formats.
5455

5556
**\--target-transport**=*TARGET_TRANSPORT* \[default: registry\]
5657

@@ -79,55 +80,56 @@ previous paragraph. See skopeo(1) for accepted formats.
7980
suppresses the check; use this when you know the issues it might
8081
find are addressed.
8182

82-
A common reason this may fail is when one is using an image which
83-
requires registry authentication, but not embedding the pull secret in
84-
the image so that updates can be fetched by the installed OS \"day 2\".
83+
A common reason this may fail is when one is using an image which
84+
requires registry authentication, but not embedding the pull secret
85+
in the image so that updates can be fetched by the installed OS
86+
\"day 2\".
8587

8688
**\--disable-selinux**
8789

8890
: Disable SELinux in the target (installed) system.
8991

90-
This is currently necessary to install \*from\* a system with SELinux
91-
disabled but where the target does have SELinux enabled.
92+
This is currently necessary to install \*from\* a system with
93+
SELinux disabled but where the target does have SELinux enabled.
9294

9395
**\--karg**=*KARG*
9496

9597
: Add a kernel argument. This option can be provided multiple times.
9698

97-
Example: \--karg=nosmt \--karg=console=ttyS0,114800n8
99+
Example: \--karg=nosmt \--karg=console=ttyS0,114800n8
98100

99101
**\--root-ssh-authorized-keys**=*ROOT_SSH_AUTHORIZED_KEYS*
100102

101103
: The path to an \`authorized_keys\` that will be injected into the
102104
\`root\` account.
103105

104-
The implementation of this uses systemd \`tmpfiles.d\`, writing to a
105-
file named \`/etc/tmpfiles.d/bootc-root-ssh.conf\`. This will have the
106-
effect that by default, the SSH credentials will be set if not present.
107-
The intention behind this is to allow mounting the whole \`/root\` home
108-
directory as a \`tmpfs\`, while still getting the SSH key replaced on
109-
boot.
106+
The implementation of this uses systemd \`tmpfiles.d\`, writing to a
107+
file named \`/etc/tmpfiles.d/bootc-root-ssh.conf\`. This will have
108+
the effect that by default, the SSH credentials will be set if not
109+
present. The intention behind this is to allow mounting the whole
110+
\`/root\` home directory as a \`tmpfs\`, while still getting the SSH
111+
key replaced on boot.
110112

111113
**\--generic-image**
112114

113115
: Perform configuration changes suitable for a \"generic\" disk image.
114116
At the moment:
115117

116-
\- All bootloader types will be installed - Changes to the system
117-
firmware will be skipped
118+
\- All bootloader types will be installed - Changes to the system
119+
firmware will be skipped
118120

119121
**\--bound-images**=*BOUND_IMAGES* \[default: stored\]
120122

121123
: How should logically bound images be retrieved\
122124

123-
\
124-
*Possible values:*
125+
\
126+
*Possible values:*
127+
128+
- stored: Bound images must exist in the sources root container
129+
storage (default)
125130

126-
> - stored: Bound images must exist in the sources root container
127-
> storage (default)
128-
>
129-
> - pull: Bound images will be pulled and stored directly in the
130-
> targets bootc container storage
131+
- pull: Bound images will be pulled and stored directly in the
132+
targets bootc container storage
131133

132134
**\--stateroot**=*STATEROOT*
133135

@@ -149,4 +151,4 @@ firmware will be skipped
149151

150152
# VERSION
151153

152-
v1.1.3
154+
v1.1.4

0 commit comments

Comments
 (0)