shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-09-15 13:44:41 +03:00
Code Activity

Merge pull request #31758 from DaanDeMeyer/kvm

Browse Source 
mkosi: Enable KVM
This commit is contained in:
Daan De Meyer
2024-03-14 00:16:43 +01:00
committed by GitHub
parent 8e35076101 e399efea79
commit 49fc22f46c
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/mkosi.yml vendored
View File

@@ -76,7 +76,7 @@ jobs:
steps: steps:
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
- uses: systemd/mkosi@ea1b00c3dba12662214b2e95dd1fe837cb13664b - uses: systemd/mkosi@1445b389750af22756c0fde6facc1f2f343340b4
- name: Free disk space - name: Free disk space
run: | run: |
@@ -99,7 +99,9 @@ jobs:
ToolsTreeDistribution=fedora ToolsTreeDistribution=fedora
QemuVsock=yes QemuVsock=yes
# Sometimes we run on a host with /dev/kvm, but it is broken, so explicitly disable it # Sometimes we run on a host with /dev/kvm, but it is broken, so explicitly disable it
QemuKvm=no QemuKvm=yes
# TODO: Drop once https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2038777 is fixed in Github Actions
QemuFirmware=uefi
Ephemeral=yes Ephemeral=yes
EOF EOF

5
mkosi.images/base/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh
View File

@@ -4,8 +4,9 @@
systemctl --failed --no-legend | tee /failed-services systemctl --failed --no-legend | tee /failed-services
# Check that secure boot keys were properly enrolled. # Check that secure boot keys were properly enrolled.
if ! systemd-detect-virt --container; then if ! systemd-detect-virt --container && \
cmp /sys/firmware/efi/efivars/SecureBoot-8be4df61-93ca-11d2-aa0d-00e098032b8c <(printf '\6\0\0\0\1') cmp /sys/firmware/efi/efivars/SecureBoot-8be4df61-93ca-11d2-aa0d-00e098032b8c <(printf '\6\0\0\0\1')
then
cmp /sys/firmware/efi/efivars/SetupMode-8be4df61-93ca-11d2-aa0d-00e098032b8c <(printf '\6\0\0\0\0') cmp /sys/firmware/efi/efivars/SetupMode-8be4df61-93ca-11d2-aa0d-00e098032b8c <(printf '\6\0\0\0\0')
if command -v sbsign &>/dev/null; then if command -v sbsign &>/dev/null; then

2
src/boot/efi/boot.c
View File

@@ -2376,7 +2376,7 @@ static EFI_STATUS image_start(
* so). */ * so). */
_cleanup_free_ char16_t *options = xstrdup16(options_initrd ?: entry->options_implied ? NULL : entry->options); _cleanup_free_ char16_t *options = xstrdup16(options_initrd ?: entry->options_implied ? NULL : entry->options);
if (!is_confidential_vm()) { if (entry->type == LOADER_LINUX && !is_confidential_vm()) {
const char *extra = smbios_find_oem_string("io.systemd.boot.kernel-cmdline-extra"); const char *extra = smbios_find_oem_string("io.systemd.boot.kernel-cmdline-extra");
if (extra) { if (extra) {
_cleanup_free_ char16_t *tmp = TAKE_PTR(options), *extra16 = xstr8_to_16(extra); _cleanup_free_ char16_t *tmp = TAKE_PTR(options), *extra16 = xstr8_to_16(extra);