mkosi: Update to latest

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 4d90641d1a4cd1b60beda794158fc8d1d1b7f7cf..587a1c0c5b0df65ccf9075a3542c636305866be9 100644 (file)
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - uses: systemd/mkosi@ba07d53000b6c560ad0b9f07550aca93c0284e88
+      - uses: systemd/mkosi@7051715d8541d4d077a218f7445976225ec74d78
 
       # 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

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 4d128822fbc753784fff794c4ba88f583c7cc312..873ed589b693600d2b10382f22725a124ad338fb 100644 (file)
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -113,7 +113,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - uses: systemd/mkosi@ba07d53000b6c560ad0b9f07550aca93c0284e88
+      - uses: systemd/mkosi@7051715d8541d4d077a218f7445976225ec74d78
 
       # 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

diff --git a/test/TEST-64-UDEV-STORAGE/btrfs_basic.configure b/test/TEST-64-UDEV-STORAGE/btrfs_basic.configure
index 8ef58a9fddaa47ae29fca61782fa8a7d069dc2f3..85ec983fc3374b34a8687154b6cbe400a8648c74 100755 (executable)
--- a/test/TEST-64-UDEV-STORAGE/btrfs_basic.configure
+++ b/test/TEST-64-UDEV-STORAGE/btrfs_basic.configure
@@ -11,7 +11,7 @@ config["QemuArgs"] += ["-device", "virtio-scsi-pci,id=scsi0"]
 
 for i in range(4):
     id = f"drivebtrfsbasic{i}"
-    config["QemuDrives"] += [
+    config["Drives"] += [
         {
             "Id": id,
             "Size": "350M" if i == 0 else "128M",

diff --git a/test/TEST-64-UDEV-STORAGE/iscsi_lvm.configure b/test/TEST-64-UDEV-STORAGE/iscsi_lvm.configure
index ca23e338589d5eec88c1acf99119fbb82b43cae9..1d7a0c5b9a1c4ddcb3556908254905dc8ab85172 100755 (executable)
--- a/test/TEST-64-UDEV-STORAGE/iscsi_lvm.configure
+++ b/test/TEST-64-UDEV-STORAGE/iscsi_lvm.configure
@@ -11,7 +11,7 @@ config["QemuArgs"] += ["-device", "virtio-scsi-pci,id=scsi0"]
 
 for i in range(4):
     id = f"driveiscsibasic{i}"
-    config["QemuDrives"] += [
+    config["Drives"] += [
         {
             "Id": id,
             "Size": "150M" if i == 0 else "70M",

diff --git a/test/TEST-64-UDEV-STORAGE/long_sysfs_path.configure b/test/TEST-64-UDEV-STORAGE/long_sysfs_path.configure
index 02e2ac4daaabec54708e108c6ac55b0446862cbe..a920171add0f37a4cd45df702c43510d161511f3 100755 (executable)
--- a/test/TEST-64-UDEV-STORAGE/long_sysfs_path.configure
+++ b/test/TEST-64-UDEV-STORAGE/long_sysfs_path.configure
@@ -7,7 +7,7 @@ import sys
 
 config = json.load(sys.stdin)
 
-config["QemuDrives"] += [
+config["Drives"] += [
     {
         "Id": "drive0",
         "Size": "64M",

diff --git a/test/TEST-64-UDEV-STORAGE/lvm_basic.configure b/test/TEST-64-UDEV-STORAGE/lvm_basic.configure
index 9387b8377ccafa36b5e60c5d293f088aeaf70fcc..c4074becb46857068ff6e67b379647ae7f230a23 100755 (executable)
--- a/test/TEST-64-UDEV-STORAGE/lvm_basic.configure
+++ b/test/TEST-64-UDEV-STORAGE/lvm_basic.configure
@@ -11,7 +11,7 @@ config["QemuArgs"] += ["-device", "virtio-scsi-pci,id=scsi0"]
 
 for i in range(4):
     id = f"drivelvmbasic{i}"
-    config["QemuDrives"] += [
+    config["Drives"] += [
         {
             "Id": id,
             "Size": "32M",

diff --git a/test/TEST-64-UDEV-STORAGE/mdadm_basic.configure b/test/TEST-64-UDEV-STORAGE/mdadm_basic.configure
index 3f00afa955f6aa50f0bd9216dfb9883368b3da75..d722e081e28782e64a76b92ef34731202b07d990 100755 (executable)
--- a/test/TEST-64-UDEV-STORAGE/mdadm_basic.configure
+++ b/test/TEST-64-UDEV-STORAGE/mdadm_basic.configure
@@ -11,7 +11,7 @@ config["QemuArgs"] += ["-device", "virtio-scsi-pci,id=scsi0"]
 
 for i in range(5):
     id = f"drivemdadmbasic{i}"
-    config["QemuDrives"] += [
+    config["Drives"] += [
         {
             "Id": id,
             "Size": "64M",

diff --git a/test/TEST-64-UDEV-STORAGE/mdadm_lvm.configure b/test/TEST-64-UDEV-STORAGE/mdadm_lvm.configure
index b7661d9e815fa2dfe2d170ca44f632029ea06843..d669895925ca9804f7bff8d7fe91d0fb5fe7e829 100755 (executable)
--- a/test/TEST-64-UDEV-STORAGE/mdadm_lvm.configure
+++ b/test/TEST-64-UDEV-STORAGE/mdadm_lvm.configure
@@ -11,7 +11,7 @@ config["QemuArgs"] += ["-device", "virtio-scsi-pci,id=scsi0"]
 
 for i in range(5):
     id = f"drivemdadmlvm{i}"
-    config["QemuDrives"] += [
+    config["Drives"] += [
         {
             "Id": id,
             "Size": "64M",

diff --git a/test/TEST-64-UDEV-STORAGE/multipath_basic_failover.configure b/test/TEST-64-UDEV-STORAGE/multipath_basic_failover.configure
index 5f323b8a8b7e45b4f0f7fa61891fb39c23c43033..a59927c3b7fb40b01afb099efd5190354b05d58d 100755 (executable)
--- a/test/TEST-64-UDEV-STORAGE/multipath_basic_failover.configure
+++ b/test/TEST-64-UDEV-STORAGE/multipath_basic_failover.configure
@@ -18,7 +18,7 @@ for ndisk in range(16):
 
     for nback in range(4):
         id = f"drive{ndisk}x{nback}"
-        config["QemuDrives"] += [
+        config["Drives"] += [
             {
                 "Id": id,
                 "Size": size,

diff --git a/test/TEST-64-UDEV-STORAGE/nvme_basic.configure b/test/TEST-64-UDEV-STORAGE/nvme_basic.configure
index b740c096c4e6045ac0e23c0f4c81c076d39a427c..948003e4dee7633cc0542b3e77c0b740b292accf 100755 (executable)
--- a/test/TEST-64-UDEV-STORAGE/nvme_basic.configure
+++ b/test/TEST-64-UDEV-STORAGE/nvme_basic.configure
@@ -18,7 +18,7 @@ if 'name "nvme"' not in result.stdout:
 def add_drive(i: int, serial: str) -> None:
     global config
     id = f"nvme{i}"
-    config["QemuDrives"] += [
+    config["Drives"] += [
         {
             "Id": id,
             "Size": "1M",

diff --git a/test/TEST-64-UDEV-STORAGE/nvme_subsystem.configure b/test/TEST-64-UDEV-STORAGE/nvme_subsystem.configure
index 3d7900773cd04fb582253894273438dc11726bee..029d4360ba95fd2e198e214fbbedfd385f30d51f 100755 (executable)
--- a/test/TEST-64-UDEV-STORAGE/nvme_subsystem.configure
+++ b/test/TEST-64-UDEV-STORAGE/nvme_subsystem.configure
@@ -16,7 +16,7 @@ if 'name "nvme"' not in result.stdout:
     exit(77)
 
 for id in ("nvme0", "nvme1"):
-    config["QemuDrives"] += [
+    config["Drives"] += [
         {
             "Id": id,
             "Size": "1M",

diff --git a/test/TEST-64-UDEV-STORAGE/simultaneous_events.configure b/test/TEST-64-UDEV-STORAGE/simultaneous_events.configure
index a0edb01cc1a35a61ec45f25e13c42f820791c6ee..668f3e2aa06a6e18046d2a9c77fb61ba9512455b 100755 (executable)
--- a/test/TEST-64-UDEV-STORAGE/simultaneous_events.configure
+++ b/test/TEST-64-UDEV-STORAGE/simultaneous_events.configure
@@ -9,7 +9,7 @@ config = json.load(sys.stdin)
 
 for i in range(10):
     id = f"drivesimultaneousevents{i}"
-    config["QemuDrives"] += [
+    config["Drives"] += [
         {
             "Id": id,
             "Size": "128M",

diff --git a/test/TEST-64-UDEV-STORAGE/virtio_scsi_basic.configure b/test/TEST-64-UDEV-STORAGE/virtio_scsi_basic.configure
index ab8d530a3e3f7b4ce01534686f86b1fb7b0ab592..91e1fe14e55c16786dbde20b4a0e91832667d523 100755 (executable)
--- a/test/TEST-64-UDEV-STORAGE/virtio_scsi_basic.configure
+++ b/test/TEST-64-UDEV-STORAGE/virtio_scsi_basic.configure
@@ -12,7 +12,7 @@ for i in range(4):
 
 for i in range(128):
     id = f"drive{i}"
-    config["QemuDrives"] += [
+    config["Drives"] += [
         {
             "Id": id,
             "Size": "1M",

diff --git a/test/TEST-64-UDEV-STORAGE/virtio_scsi_identically_named_partitions.configure b/test/TEST-64-UDEV-STORAGE/virtio_scsi_identically_named_partitions.configure
index edc5138ce809c8cdf2ce4d7f9a9d8f8a8814529a..dce6b1503ffabb26387adfe97f98dcc06df54ef4 100755 (executable)
--- a/test/TEST-64-UDEV-STORAGE/virtio_scsi_identically_named_partitions.configure
+++ b/test/TEST-64-UDEV-STORAGE/virtio_scsi_identically_named_partitions.configure
@@ -21,7 +21,7 @@ config["QemuArgs"] += ["-device", "virtio-scsi-pci,id=scsi0,num_queues=4"]
 
 for i in range(0, num_disk):
     id = f"drive{i}"
-    config["QemuDrives"] += [
+    config["Drives"] += [
         {
             "Id": id,
             "Size": "40M",