From b13d3ce30caf97a0619ab27aef143a56016c5af1bac4ec8a365339d7452b3dcc Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 6 Feb 2024 17:46:24 +0000 Subject: [PATCH] - bsc#1206361 - SLES 15 SP5 Beta2 - virt-customize ssh-inject fails (s390x/kvm/libvirt) (-> Server-Applications module) use-rtc-driftfix-slew-for-x86-only.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=568 --- libguestfs.changes | 7 +++++++ libguestfs.spec | 1 + use-rtc-driftfix-slew-for-x86-only.patch | 13 +++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 use-rtc-driftfix-slew-for-x86-only.patch diff --git a/libguestfs.changes b/libguestfs.changes index dad55de..69d71d3 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 5 14:24:08 MST 2024 - carnold@suse.com + +- bsc#1206361 - SLES 15 SP5 Beta2 - virt-customize ssh-inject fails + (s390x/kvm/libvirt) (-> Server-Applications module) + use-rtc-driftfix-slew-for-x86-only.patch + ------------------------------------------------------------------- Thu Feb 1 04:30:27 UTC 2024 - Dominique Leuenberger diff --git a/libguestfs.spec b/libguestfs.spec index a6b2a0e..098d29c 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -32,6 +32,7 @@ Source100: mount-rootfs-and-chroot.sh Source101: README # Patches +Patch1: use-rtc-driftfix-slew-for-x86-only.patch BuildRequires: bison BuildRequires: file-devel diff --git a/use-rtc-driftfix-slew-for-x86-only.patch b/use-rtc-driftfix-slew-for-x86-only.patch new file mode 100644 index 0000000..0313bb2 --- /dev/null +++ b/use-rtc-driftfix-slew-for-x86-only.patch @@ -0,0 +1,13 @@ +--- libguestfs-1.52.0/lib/launch-direct.c.orig 2024-02-05 14:17:10.208970293 -0700 ++++ libguestfs-1.52.0/lib/launch-direct.c 2024-02-05 14:21:37.548976664 -0700 +@@ -650,7 +650,10 @@ launch_direct (guestfs_h *g, void *datav + flag ("-no-reboot"); + + /* These are recommended settings, see RHBZ#1053847. */ ++#if defined(__i386__) || defined(__x86_64__) ++ /* Man page states, "Enable driftfix (i386 targets only)" */ + arg ("-rtc", "driftfix=slew"); ++#endif + if (guestfs_int_qemu_supports (g, data->qemu_data, "-no-hpet")) + flag ("-no-hpet"); + #if defined(__i386__) || defined(__x86_64__)