From b90f896880817da5ef41a08681426090edf2f25d Mon Sep 17 00:00:00 2001 From: Matteo Croce Date: Thu, 19 Dec 2024 19:51:42 +0100 Subject: [PATCH] mkosi: move config options Move some config option in the right section, fixes the following warning: ``` mkosi.conf: Setting Credentials should be configured in [Runtime], not [Host]. mkosi.conf: Setting RuntimeBuildSources should be configured in [Runtime], not [Host]. mkosi.conf: Setting RuntimeScratch should be configured in [Runtime], not [Host]. mkosi.conf: Setting QemuSmp should be configured in [Runtime], not [Host]. mkosi.conf: Setting QemuSwtpm should be configured in [Runtime], not [Host]. mkosi.conf: Setting QemuVsock should be configured in [Runtime], not [Host]. mkosi.conf: Setting QemuKvm should be configured in [Runtime], not [Host]. ``` (cherry picked from commit 77d4a263c14ffbb6133382bc18319b6a54a8eaae) --- .github/workflows/coverage.yml | 4 ++-- .github/workflows/mkosi.yml | 4 ++-- mkosi.conf | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 73409e53ef..410f77dc5e 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: systemd/mkosi@07ef37c4c0dad5dfc6cec86c967a7600df1cd88c + - uses: systemd/mkosi@7d45366395f29fdb2b534a850c09d23d29b78fa9 # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space # immediately, we remove the files in the background. However, we first move them to a different location @@ -64,7 +64,7 @@ jobs: MESON_OPTIONS=--werror COVERAGE=1 - [Host] + [Runtime] QemuMem=4G EOF diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index e7575fb6bb..3a10d116eb 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -113,7 +113,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: systemd/mkosi@c4bbf3b71a3e2cf947995caedf10f69da3c4957a + - uses: systemd/mkosi@7d45366395f29fdb2b534a850c09d23d29b78fa9 # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space # immediately, we remove the files in the background. However, we first move them to a different location @@ -171,7 +171,7 @@ jobs: [Content] SELinuxRelabel=${{ matrix.relabel }} - [Host] + [Runtime] QemuMem=4G EOF diff --git a/mkosi.conf b/mkosi.conf index 5622667078..3da4e07a87 100644 --- a/mkosi.conf +++ b/mkosi.conf @@ -130,7 +130,7 @@ Packages= zsh zstd -[Host] +[Runtime] Credentials= journal.storage=persistent tty.serial.hvc0.agetty.autologin=root