Skip to content

Commit 147d522

Browse files
committed
sbctl: fixup docs and some comments
The man page still had some /usr/share mentions Signed-off-by: Morten Linderud <[email protected]>
1 parent d5bbe94 commit 147d522

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

docs/sbctl.8.txt

+3-7
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,9 @@ EFI signing commands
3434

3535
*-e*, *--export*;;
3636
The directory to persist the exported keys.
37-
+
38-
Default: "/usr/share/secureboot/keys/"
3937

4038
*-d*, *--database-path*;;
4139
Path to save the GUID file when generating keys.
42-
+
43-
Default: "/usr/share/secureboot/"
4440

4541
**enroll-keys**::
4642
Enrolls the created key into the EFI variables.
@@ -65,8 +61,8 @@ EFI signing commands
6561
This feature is experimental
6662

6763
*-c*, *--custom*;;
68-
Enroll custom KEK and db certificates from "/usr/share/secureboot/keys/custom/KEK/",
69-
"/usr/share/secureboot/keys/custom/db/",
64+
Enroll custom KEK and db certificates from "/var/lib/sbctl/keys/custom/KEK/",
65+
"/var/lib/sbctl/keys/custom/db/",
7066
respectively.
7167

7268
*-f*, *--firmware-builtin*;;
@@ -449,7 +445,7 @@ not be enabled unless no other way to enter key management is provided.
449445
If this step is not completed, enrolling custom keys will be rejected by the firmware.
450446

451447
Next is creating the keys for secure boot. 'create-keys' creates the key
452-
hierarchy needed for secure boot into "/usr/share/secureboot".
448+
hierarchy needed for secure boot into "/var/lib/sbctl/keys".
453449

454450
# sbctl create-keys
455451
Created Owner UUID a9fbbdb7-a05f-48d5-b63a-08c5df45ee70

sbctl.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ import (
1515
"github.com/spf13/afero"
1616
)
1717

18-
// TODO: Remove this at some point
19-
// Only here for legacy reasons to denote the old path
20-
2118
var (
19+
// TODO: Remove this at some point
20+
// Only here for legacy reasons to denote the old path
2221
DatabasePath = "/usr/share/secureboot/"
2322
Version = "unknown"
2423
)

0 commit comments

Comments
 (0)