From 214ae513338fb5c2f1070259228d927e634aa92d Mon Sep 17 00:00:00 2001
From: Ettore Di Giacinto <mudler@users.noreply.github.com>
Date: Wed, 23 Nov 2022 09:59:55 +0000
Subject: [PATCH] Bind it to sysroot
---
dracut/29kcrypt/generator.sh | 2 ++
pkg/bus/bus.go | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/dracut/29kcrypt/generator.sh b/dracut/29kcrypt/generator.sh
index 485cfb4..c3443ff 100755
--- a/dracut/29kcrypt/generator.sh
+++ b/dracut/29kcrypt/generator.sh
@@ -16,6 +16,7 @@ neednet="rd.neednet"
echo "DefaultDependencies=no"
echo "Description=kcrypt online mount"
echo "Before=cos-immutable-rootfs.service"
+ echo "Conflicts=initrd-switch-root.target"
if getargbool 0 $neednet; then
echo "Wants=network-online.target"
echo "After=network-online.target"
@@ -24,6 +25,7 @@ neednet="rd.neednet"
if [ -n "${oem_label}" ]; then
echo "After=oem.mount"
fi
+ echo "After=sysroot.mount"
echo "[Service]"
echo "Type=oneshot"
echo "RemainAfterExit=no"
diff --git a/pkg/bus/bus.go b/pkg/bus/bus.go
index ce2348a..b3045a5 100644
--- a/pkg/bus/bus.go
+++ b/pkg/bus/bus.go
@@ -28,7 +28,7 @@ type Bus struct {
func (b *Bus) LoadProviders() {
wd, _ := os.Getwd()
- b.Manager.Autoload("kcrypt-discovery", "/system/discovery", "/oem/kcrypt", "/oem/system/discovery", wd).Register()
+ b.Manager.Autoload("kcrypt-discovery", "/sysroot/system/discovery", "/system/discovery", "/oem/kcrypt", "/oem/system/discovery", wd).Register()
}
func (b *Bus) Initialize() {