mirror of
https://github.com/kairos-io/immucore.git
synced 2025-08-20 07:13:06 +00:00
Unlock after oem to read the server config (#126)
This commit is contained in:
parent
d59fa6789c
commit
18c70b4ff1
@ -28,13 +28,14 @@ func (s *State) RegisterNormalBoot(g *herd.Graph) error {
|
|||||||
// Depend on LVM in case the LVM is encrypted somehow? Not sure if possible.
|
// Depend on LVM in case the LVM is encrypted somehow? Not sure if possible.
|
||||||
s.LogIfError(s.RunKcryptUpgrade(g, herd.WithDeps(cnst.OpLvmActivate)), "upgrade kcrypt partitions")
|
s.LogIfError(s.RunKcryptUpgrade(g, herd.WithDeps(cnst.OpLvmActivate)), "upgrade kcrypt partitions")
|
||||||
|
|
||||||
|
// Mount COS_OEM (After root as it mounts under s.Rootdir/oem)
|
||||||
|
s.LogIfError(s.MountOemDagStep(g, cnst.OpMountRoot, cnst.OpLvmActivate), "oem mount")
|
||||||
|
|
||||||
// Run unlock.
|
// Run unlock.
|
||||||
// Depends on mount root because it needs the kcrypt-discovery-challenger available under /sysroot
|
// Depends on mount root because it needs the kcrypt-discovery-challenger available under /sysroot
|
||||||
// Depends on OpKcryptUpgrade until we don't support upgrading from 1.X to the current version
|
// Depends on OpKcryptUpgrade until we don't support upgrading from 1.X to the current version
|
||||||
s.LogIfError(s.RunKcrypt(g, herd.WithDeps(cnst.OpMountRoot, cnst.OpKcryptUpgrade)), "kcrypt unlock")
|
// Depends on mount oem to read the server configuration
|
||||||
|
s.LogIfError(s.RunKcrypt(g, herd.WithDeps(cnst.OpMountRoot, cnst.OpKcryptUpgrade, cnst.OpMountOEM)), "kcrypt unlock")
|
||||||
// Mount COS_OEM (After root as it mounts under s.Rootdir/oem)
|
|
||||||
s.LogIfError(s.MountOemDagStep(g, cnst.OpMountRoot, cnst.OpLvmActivate), "oem mount")
|
|
||||||
|
|
||||||
// Run yip stage rootfs. Requires root+oem+sentinel to be mounted
|
// Run yip stage rootfs. Requires root+oem+sentinel to be mounted
|
||||||
s.LogIfError(s.RootfsStageDagStep(g, herd.WithDeps(cnst.OpMountRoot, cnst.OpMountOEM, cnst.OpSentinel)), "running rootfs stage")
|
s.LogIfError(s.RootfsStageDagStep(g, herd.WithDeps(cnst.OpMountRoot, cnst.OpMountOEM, cnst.OpSentinel)), "running rootfs stage")
|
||||||
|
Loading…
Reference in New Issue
Block a user