Skip to content

Commit 9549e70

Browse files
authored
Merge pull request #214 from endlessm/fix-misc
Drop debug message & fix signing kernel doc
2 parents e0f0c52 + c77098e commit 9549e70

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

doc/overview/signing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ provided by Shim via the `shim_lock` API.
6161
The kernel is signed in one of two ways, depending on the `signed_boot` project
6262
option.
6363

64-
When `signed_boot == "snakeoil"`, the element `eos/signed-kernel-snakeoil.bst`
64+
When `signed_boot == "snakeoil"`, the element `signing/signed-kernel-snakeoil.bst`
6565
produces a signed kernel using the public `VENDOR-snakeoil` key.
6666

6767
In this case, the kernel embeds the `MODULES-snakeoil` certificate and can
6868
use that to validate modules.
6969

70-
When `signed_boot == "endless"`, the element `eos/signed-kernel.bst`
70+
When `signed_boot == "endless"`, the element `signing/signed-kernel-endless.bst`
7171
requests an official signature from the private eos-sb-signer service.
7272

7373
In this case, the kernel generates a new private key and certificate as part

elements/eos/systemd-sysusers-override.bst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,10 @@ public:
4646
systemd_sysusers_override.py $SYSROOT/usr/lib/sysusers.d/basic.conf --group lp --static-id 7
4747
systemd_sysusers_override.py $SYSROOT/usr/lib/sysusers.d/basic.conf --group sudo --static-id 27
4848
systemd_sysusers_override.py $SYSROOT/usr/lib/sysusers.d/basic.conf --group utmp --static-id 43
49-
ls -al $SYSROOT/usr/lib/sysusers.d/polkit.conf
5049
systemd_sysusers_override.py $SYSROOT/usr/lib/sysusers.d/polkit.conf --user polkitd --static-id 105
5150
systemd_sysusers_override.py $SYSROOT/usr/lib/sysusers.d/systemd-journal.conf --group systemd-journal --static-id 121
5251
systemd_sysusers_override.py $SYSROOT/usr/lib/sysusers.d/systemd-timesync.conf --user systemd-timesync --static-id 133
5352
5453
# Update tmpfiles.d configs for 'wheel' group rename.
55-
ls -l $SYSROOT/usr/lib/tmpfiles.d/cups.conf
5654
sed -e 's/ wheel / sudo /' -i $SYSROOT/usr/lib/tmpfiles.d/cups.conf
5755
sed -e 's/:group:wheel:/:group:sudo:/' -i $SYSROOT/usr/lib/tmpfiles.d/systemd.conf

0 commit comments

Comments
 (0)