From 0fccef8a1d45e68709527a66657b76249dd4c834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 1 Jun 2025 10:08:04 +0200
Subject: [PATCH 1/2] Add machineConfigModule parameter support to all distro
 modules

- Add machineConfigModule parameter to ubuntu, debian, and fedora makeVmTestForImage functions
- Default to generic.defaultMachineConfigModule when not provided
- This allows users to customize machine configuration for VM tests
---
 debian/default.nix | 4 ++--
 fedora/default.nix | 4 ++--
 ubuntu/default.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/default.nix b/debian/default.nix
index 986f855..0b623d5 100644
--- a/debian/default.nix
+++ b/debian/default.nix
@@ -6,8 +6,8 @@ let
     url = image.name;
   };
   images = lib.mapAttrs (k: v: fetchImage v) imagesJSON.${system};
-  makeVmTestForImage = image: { testScript, sharedDirs, diskSize ? null }: generic.makeVmTest {
-    inherit system testScript sharedDirs;
+  makeVmTestForImage = image: { testScript, sharedDirs, diskSize ? null, machineConfigModule ? generic.defaultMachineConfigModule }: generic.makeVmTest {
+    inherit system testScript sharedDirs machineConfigModule;
     image = prepareDebianImage {
       inherit diskSize;
       hostPkgs = pkgs;
diff --git a/fedora/default.nix b/fedora/default.nix
index dbebb85..34f813b 100644
--- a/fedora/default.nix
+++ b/fedora/default.nix
@@ -6,8 +6,8 @@ let
     url = "https://download.fedoraproject.org/pub/fedora/linux/releases/${image.name}";
   };
   images = lib.mapAttrs (k: v: fetchImage v) (imagesJSON.${system} or {});
-  makeVmTestForImage = image: { testScript, sharedDirs, diskSize ? null, extraPathsToRegister ? [ ]}: generic.makeVmTest {
-    inherit system testScript sharedDirs;
+  makeVmTestForImage = image: { testScript, sharedDirs, diskSize ? null, extraPathsToRegister ? [ ], machineConfigModule ? generic.defaultMachineConfigModule }: generic.makeVmTest {
+    inherit system testScript sharedDirs machineConfigModule;
     image = prepareFedoraImage {
       inherit diskSize extraPathsToRegister;
       hostPkgs = pkgs;
diff --git a/ubuntu/default.nix b/ubuntu/default.nix
index 6cc5097..a946cca 100644
--- a/ubuntu/default.nix
+++ b/ubuntu/default.nix
@@ -6,8 +6,8 @@ let
     url = image.name;
   };
   images = lib.mapAttrs (k: v: fetchImage v) imagesJSON.${system};
-  makeVmTestForImage = image: { testScript, sharedDirs, diskSize ? null, extraPathsToRegister ? [ ] }: generic.makeVmTest {
-    inherit system testScript sharedDirs;
+  makeVmTestForImage = image: { testScript, sharedDirs, diskSize ? null, extraPathsToRegister ? [ ], machineConfigModule ? generic.defaultMachineConfigModule }: generic.makeVmTest {
+    inherit system testScript sharedDirs machineConfigModule;
     image = prepareUbuntuImage {
       inherit diskSize extraPathsToRegister;
       hostPkgs = pkgs;

From d6642fbaf42fc98883d84bab66cd0ec720d9dd0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 1 Jun 2025 10:11:58 +0200
Subject: [PATCH 2/2] Fix debian module to accept extraPathsToRegister
 parameter

- Add missing extraPathsToRegister parameter to debian makeVmTestForImage function
- This ensures consistency with ubuntu and fedora modules
- Fixes parameter mismatch where prepareDebianImage expected extraPathsToRegister but makeVmTestForImage didn't accept it
---
 debian/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/default.nix b/debian/default.nix
index 0b623d5..341f23d 100644
--- a/debian/default.nix
+++ b/debian/default.nix
@@ -6,10 +6,10 @@ let
     url = image.name;
   };
   images = lib.mapAttrs (k: v: fetchImage v) imagesJSON.${system};
-  makeVmTestForImage = image: { testScript, sharedDirs, diskSize ? null, machineConfigModule ? generic.defaultMachineConfigModule }: generic.makeVmTest {
+  makeVmTestForImage = image: { testScript, sharedDirs, diskSize ? null, extraPathsToRegister ? [ ], machineConfigModule ? generic.defaultMachineConfigModule }: generic.makeVmTest {
     inherit system testScript sharedDirs machineConfigModule;
     image = prepareDebianImage {
-      inherit diskSize;
+      inherit diskSize extraPathsToRegister;
       hostPkgs = pkgs;
       originalImage = image;
     };