Fix key file issue

valtzu · Feb 8, 2025 · dfb91a0 · dfb91a0
1 parent aa0be47
commit dfb91a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Build images
         run: mkosi build
       - name: Test images
-        run: mkosi '--kernel-command-line-extra=systemd.run="echo hello"' qemu
+        run: mkosi '--credential=cryptsetup.passphrase=123' '--kernel-command-line-extra=systemd.run="echo hello"' qemu
       - name: Compress outputs
         if: startsWith(github.ref, 'refs/tags/')
         run: xz -0 ${{ env.OUTPUT_DIR }}/${{ env.OUTPUT }}*.raw ${{ env.OUTPUT_DIR }}/${{ env.OUTPUT }}*.efi

diff --git a/...d/mkosi.extra/etc/systemd/system/systemd-repart.service.d/encryption-key-from-eeprom.conf b/...d/mkosi.extra/etc/systemd/system/systemd-repart.service.d/encryption-key-from-eeprom.conf
@@ -1,7 +1,4 @@
-[Unit]
-ConditionVirtualization=no
-ConditionArchitecture=arm64
-
 [Service]
 ExecStart=
-ExecStart=systemd-repart --dry-run=no --key-file=/sys/bus/nvmem/devices/rmem1/nvmem
+ExecStart=systemd-repart --dry-run=no --key-file=%d/cryptsetup.passphrase
+ImportCredential=cryptsetup.passphrase