kairos/immucore
1
0
Fork 0
mirror of https://github.com/kairos-io/immucore.git synced 2025-09-19 09:12:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a pure golang pcr extend (#286)

Browse Source
This commit is contained in:
Itxaka
2024-04-19 11:43:05 +00:00
committed by GitHub
parent d14a047aa6
commit cbf38f553c
5 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/state/steps_uki.go
View File

@@ -23,16 +23,9 @@ import (
)
// UKIExtendPCR extends the PCR with the given extension in a graceful way.
func UKIExtendPCR(extension string) (string, error) {
if _, err := os.Stat("/usr/lib/systemd/systemd-pcrphase"); err == nil {
return internalUtils.CommandWithPath(fmt.Sprintf("/usr/lib/systemd/systemd-pcrphase --graceful %s", extension))
}
func UKIExtendPCR(extension string) error {
return internalUtils.PCRExtend(cnst.DefaultPCR, []byte(extension))
if _, err := os.Stat("/usr/lib/systemd/systemd-pcrextend"); err == nil {
return internalUtils.CommandWithPath(fmt.Sprintf("/usr/lib/systemd/systemd-pcrextend --graceful %s", extension))
}
return "", fmt.Errorf("no systemd-pcrphase or systemd-pcrextend found")
}
// UKIMountBaseSystem mounts the base system for the UKI boot system
@@ -304,10 +297,9 @@ func (s *State) UkiPivotToSysroot(g *herd.Graph) error {
}
ext := "enter-initrd"
output, pcrErr := UKIExtendPCR(ext)
pcrErr := UKIExtendPCR(ext)
if pcrErr != nil {
internalUtils.Log.Err(pcrErr).Msg("running systemd-pcrextends")
internalUtils.Log.Debug().Str("ext", ext).Str("out", output).Msg("systemd-pcrextends")
internalUtils.Log.Err(pcrErr).Str("ext", ext).Msg("extend-pcr")
}
pcrErr = os.MkdirAll("/run/systemd", 0755) // #nosec G301 -- Original dir has this permissions
@@ -492,10 +484,9 @@ func (s *State) UKIBootInitDagStep(g *herd.Graph) error {
var err error
ext := "leave-initrd"
output, err := UKIExtendPCR(ext)
err = UKIExtendPCR(ext)
if err != nil {
internalUtils.Log.Err(err).Msg("running systemd-pcrextends")
internalUtils.Log.Debug().Str("ext", ext).Str("out", output).Msg("systemd-pcrextends")
internalUtils.Log.Err(err).Str("ext", ext).Msg("extend-pcr")
internalUtils.DropToEmergencyShell()
}