openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

format patches

This commit is contained in:
Cong Liu 2022-11-11 16:30:14 +08:00
parent 4fc84b01fd
commit 21fdeab093
2 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
debian/patches/legacy-images.patch vendored
View File

@ -1,12 +1,16 @@
Description: Fix legacy-images path for focal. From: Dimitri John Ledkov <xnox@ubuntu.com>
Author: Dimitri John Ledkov <xnox@ubuntu.com> Date: Fri, 11 Nov 2022 16:30:14 +0800
Subject: Fix legacy-images path for focal.
Bug-Ubuntu: https://launchpad.net/bugs/1872941 Bug-Ubuntu: https://launchpad.net/bugs/1872941
---
virtinst/install/urldetect.py | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/virtinst/install/urldetect.py b/virtinst/install/urldetect.py
Index: virt-manager-2.2.1/virtinst/install/urldetect.py index 7969ad4..decdf28 100644
=================================================================== --- a/virtinst/install/urldetect.py
--- virt-manager-2.2.1.orig/virtinst/install/urldetect.py +++ b/virtinst/install/urldetect.py
+++ virt-manager-2.2.1/virtinst/install/urldetect.py
@@ -640,6 +640,8 @@ class _DebianDistro(_DistroTree): @@ -640,6 +640,8 @@ class _DebianDistro(_DistroTree):
media_type = None media_type = None
if check_manifest("current/images/MANIFEST"): if check_manifest("current/images/MANIFEST"):

41
debian/patches/mark-libvirt-lxc.patch vendored
View File

@ -1,24 +1,22 @@
Description: Clearly mark the LXC connections as being libvirt-lxc, to From: Serge Hallyn <serge.hallyn@ubuntu.com>
avoid confusion due to differing features and configurations. Date: Fri, 11 Nov 2022 16:30:14 +0800
Subject: Clearly mark the LXC connections as being libvirt-lxc, to
Written: 2015-08-22 Written: 2015-08-22
Author: Serge Hallyn <serge.hallyn@ubuntu.com>
Updated: 2019-12-06 Updated: 2019-12-06
Forwarded: https://github.com/virt-manager/virt-manager/pull/67 Forwarded: https://github.com/virt-manager/virt-manager/pull/67
--- a/virtManager/createconn.py avoid confusion due to differing features and configurations.
+++ b/virtManager/createconn.py ---
@@ -171,7 +171,7 @@ class vmmConnect(vmmGObjectUI): virtManager/connection.py | 2 +-
_add_hv_row(HV_QEMU, "qemu", "QEMU/KVM") virtManager/createconn.py | 2 +-
_add_hv_row(HV_QEMU_SESSION, "qemu", "QEMU/KVM " + _("user session")) 2 files changed, 2 insertions(+), 2 deletions(-)
_add_hv_row(HV_XEN, "xen", "Xen")
- _add_hv_row(HV_LXC, "lxc", "LXC (" + _("Linux Containers") + ")") diff --git a/virtManager/connection.py b/virtManager/connection.py
+ _add_hv_row(HV_LXC, "lxc", "Libvirt-LXC (Linux Containers)") index f6dc5f5..e1eb299 100644
_add_hv_row(HV_BHYVE, "bhyve", "Bhyve")
_add_hv_row(HV_VZ, "vz", "Virtuozzo")
_add_hv_row(-1, None, "")
--- a/virtManager/connection.py --- a/virtManager/connection.py
+++ b/virtManager/connection.py +++ b/virtManager/connection.py
@@ -433,7 +433,7 @@ class vmmConnection(vmmGObject): @@ -390,7 +390,7 @@ class vmmConnection(vmmGObject):
"esx": "ESX", "esx": "ESX",
"gsx": "GSX", "gsx": "GSX",
"libxl": "libxl", "libxl": "libxl",
@ -27,3 +25,16 @@ Forwarded: https://github.com/virt-manager/virt-manager/pull/67
"openvz": "OpenVZ", "openvz": "OpenVZ",
"phyp": "phyp", "phyp": "phyp",
"qemu": "QEMU/KVM", "qemu": "QEMU/KVM",
diff --git a/virtManager/createconn.py b/virtManager/createconn.py
index d30ee09..470e246 100644
--- a/virtManager/createconn.py
+++ b/virtManager/createconn.py
@@ -116,7 +116,7 @@ class vmmCreateConn(vmmGObjectUI):
_add_hv_row(HV_QEMU, "qemu", "QEMU/KVM")
_add_hv_row(HV_QEMU_SESSION, "qemu", "QEMU/KVM " + _("user session"))
_add_hv_row(HV_XEN, "xen", "Xen")
- _add_hv_row(HV_LXC, "lxc", "LXC (" + _("Linux Containers") + ")")
+ _add_hv_row(HV_LXC, "lxc", "Libvirt-LXC (Linux Containers)")
_add_hv_row(HV_BHYVE, "bhyve", "Bhyve")
_add_hv_row(HV_VZ, "vz", "Virtuozzo")
_add_hv_row(-1, None, "")