AlmaLinux changes

This commit is contained in:
eabdullin 2022-04-18 11:28:29 +03:00
parent 37511da495
commit 7564d28831
2 changed files with 38 additions and 1 deletions

31
SOURCES/322.patch Normal file
View File

@ -0,0 +1,31 @@
From d6affa0209c727e0cd60b0700351f3f7c78c375e Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com>
Date: Mon, 1 Nov 2021 15:06:04 +0100
Subject: [PATCH] osinfo: use the OS kernel-url-argument if available
Each OS may specify which kernel argument is needed to specify the
installation source; use it as primary source, falling back to the
current logic. This should help supporting new OSes OOTB.
Signed-off-by: Pino Toscano <ptoscano@redhat.com>
---
virtinst/osdict.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/virtinst/osdict.py b/virtinst/osdict.py
index 1273b934b..3e9cf6dd7 100644
--- a/virtinst/osdict.py
+++ b/virtinst/osdict.py
@@ -593,6 +593,12 @@ def get_kernel_url_arg(self):
Kernel argument name the distro's installer uses to reference
a network source, possibly bypassing some installer prompts
"""
+ # Let's ask the OS for its kernel argument for the source
+ if hasattr(self._os, "get_kernel_url_argument"):
+ osarg = self._os.get_kernel_url_argument()
+ if osarg is not None:
+ return osarg
+
# SUSE distros
if self.distro in ["caasp", "sle", "sled", "sles", "opensuse"]:
return "install"

View File

@ -8,7 +8,7 @@
Name: virt-manager
Version: 3.2.0
Release: 14%{?dist}%{?extra_release}
Release: 14%{?dist}%{?extra_release}.alma
%global verrel %{version}-%{release}
Summary: Desktop tool for managing virtual machines via libvirt
@ -17,6 +17,9 @@ BuildArch: noarch
URL: https://virt-manager.org/
Source0: https://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
# AlmaLinux support patch
Patch0: 322.patch
# Fix 'domain not found' race (bz #1901081)
Patch0001: 0001-virtinst-Fix-TOCTOU-in-domain-enumeration.patch
Patch2: virt-manager-installer-Prefer-xorrisofs-over-genisoimage-mkisofs.patch
@ -192,6 +195,9 @@ done
%changelog
* Mon Apr 18 2022 Eduard Abdullin <eabdullin@almalinux.org> - 3.2.0-14.alma
- Add AlmaLinux support
* Wed Feb 9 2022 Jonathon Jongsma <jjongsma@redhat.com> - 3.2.0-14
- man: fix default value for filesystem accessmode option (rhbz#2045932)