9593fa2f52
resolves: RHEL-113820 mlcustomize/inject_virtio_win.ml: Use viostor.inf instead of guestor resolves: RHEL-112517 Fix for setting boot order for Linux guests based on grub location resolves: RHEL-115989, RHEL-115990
50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
From 1471b40d3563987f0170229b04a5ebe2ca1bf82b Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
Date: Thu, 18 Sep 2025 14:33:25 +0100
|
|
Subject: [PATCH] Update common submodule
|
|
|
|
NOTE: This is a temporary RHEL 10.2 patch.
|
|
|
|
Pull in the following commits from the common submodule:
|
|
|
|
Richard W.M. Jones (2):
|
|
daemon, generator: Use power of 2 for initial size of Hashtbl.create
|
|
mlcustomize/inject_virtio_win.ml: Use viostor.inf instead of guestor
|
|
|
|
Fixes: https://issues.redhat.com/browse/RHEL-112517
|
|
---
|
|
common | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
Submodule common 5be8d552..ad415701:
|
|
diff --git a/common/mlcustomize/customize_run.ml b/common/mlcustomize/customize_run.ml
|
|
index ff719f4e..64afd3ab 100644
|
|
--- a/common/mlcustomize/customize_run.ml
|
|
+++ b/common/mlcustomize/customize_run.ml
|
|
@@ -97,7 +97,7 @@ let run (g : G.guestfs) root (ops : ops) =
|
|
) in
|
|
|
|
(* Store the passwords and set them all at the end. *)
|
|
- let passwords = Hashtbl.create 13 in
|
|
+ let passwords = Hashtbl.create 16 in
|
|
let set_password user pw =
|
|
if Hashtbl.mem passwords user then
|
|
error (f_"multiple --root-password/--password options set the \
|
|
diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml
|
|
index b26b14d3..2056d148 100644
|
|
--- a/common/mlcustomize/inject_virtio_win.ml
|
|
+++ b/common/mlcustomize/inject_virtio_win.ml
|
|
@@ -310,9 +310,9 @@ and ddb_regedits inspect drv_name drv_pciid =
|
|
* one must add keys into the DriverDatabase.
|
|
*)
|
|
|
|
- let drv_inf = "guestor.inf" in
|
|
- let drv_inf_label = drv_inf ^ "_tmp" in
|
|
- let drv_config = "guestor_conf" in
|
|
+ let drv_inf = "viostor.inf" in
|
|
+ let drv_inf_label = drv_inf ^ "_amd64_0000000000000000" in
|
|
+ let drv_config = "scsi_inst" in
|
|
|
|
[
|
|
[ "DriverDatabase"; "DriverInfFiles"; drv_inf ],
|