Skip to content

Commit 5fa7fd0

Browse files
committed
update examples to use mount autodetection
Signed-off-by: Zen <[email protected]>
1 parent d60ed72 commit 5fa7fd0

File tree

6 files changed

+7
-17
lines changed

6 files changed

+7
-17
lines changed

examples/detached_headers.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ modules = [
99
#mount_wait = true
1010
#mount_timeout = 3
1111

12-
13-
[mounts.boot]
14-
type = "vfat"
15-
uuid = "BDF2-0139"
12+
auto_mounts = ['/boot'] # Automatically create mount config for /boot on the host
1613

1714
[cryptsetup.root]
1815
header_file = "/boot/luks_header.img"

examples/example.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ kmod_autodetect_lspci = true
3030
# The location of the gpg public key, if using a smartcard and gpg encrypted keyfile
3131
#sc_public_key = "/etc/ugrd/pubkey.gpg"
3232

33+
#auto_mounts = ['/boot'] # Automatically create mount config for /boot on the host
34+
3335
# Optionally specify the root mountpoint information manually
3436
#[mounts.root]
3537
# The label of the root filesystem, a uuid or partuuid could be used instead

examples/gpg_keyfile.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ modules = [
66
"ugrd.crypto.gpg",
77
]
88

9-
# This is necessary if the keyfile is on another device.
10-
# The keyfile could be added as a dependency if it's on the same device.
11-
[mounts.boot]
12-
type = "vfat"
13-
uuid = "4886-A631"
9+
auto_mounts = ['/boot'] # Automatically create mount config for /boot on the host
1410

1511
# Information about the LUKS volume
1612
[cryptsetup.root]

examples/luks.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ modules = [
77
"ugrd.kmod.standard_mask"
88
]
99

10-
1110
# Device mapper autodetection is enabled by default
1211
# autodetect_root_luks = true
1312

examples/raid_crypt_serial.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,14 @@ cryptsetup_key_type = "gpg"
1616
# The gpg module uses agetty on tty1 so this must be overridden
1717
primary_console = "ttyS1"
1818

19+
auto_mounts = ['/boot'] # Automatically create mount config for /boot on the host
20+
1921
# Define console information
2022
[console.ttyS1]
2123
baud = 115_200
2224
type = "vt100"
2325
local = true
2426

25-
[mounts.boot]
26-
type = "vfat"
27-
uuid = "4A48-F4DC"
28-
2927
[cryptsetup.root1]
3028
uuid = "9e04e825-7f60-4171-815a-86e01ec4c4d3"
3129
key_file = "/boot/keys/crypt1.gpg"

examples/yubikey.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ sc_public_key = "/etc/ugrd/pubkey.gpg"
1313

1414
# This is necessary if the keyfile is on another device.
1515
# The keyfile could be added as a dependency. if it's on the same device.
16-
[mounts.boot]
17-
type = "vfat"
18-
uuid = "4886-A631"
16+
auto_mounts = ['/boot'] # Automatically create mount config for /boot on the host
1917

2018
# Information about the LUKS volume
2119
[cryptsetup.root]

0 commit comments

Comments
 (0)