diff options
Diffstat (limited to 'libre/virt-manager/libre.patch')
| -rw-r--r-- | libre/virt-manager/libre.patch | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/libre/virt-manager/libre.patch b/libre/virt-manager/libre.patch index 70a822bd0..fe8e052a6 100644 --- a/libre/virt-manager/libre.patch +++ b/libre/virt-manager/libre.patch @@ -818,9 +818,9 @@ return None def get_recommended_resources(self, guest): ---- virt-manager-1.4.2.orig/virtinst/urlfetcher.py 2017-08-02 12:57:43.000000000 -0500 -+++ virt-manager-1.4.2/virtinst/urlfetcher.py 2017-08-15 01:50:32.319461427 -0500 -@@ -384,96 +384,6 @@ +--- virt-manager-1.5.0.orig/virtinst/urlfetcher.py 2018-01-27 15:57:20.000000000 -0500 ++++ virt-manager-1.5.0/virtinst/urlfetcher.py 2018-02-15 22:07:10.133800027 -0500 +@@ -408,96 +408,6 @@ return treeinfo @@ -888,7 +888,7 @@ - dclass = GenericDistro - if distribution: - if re.match(".*SUSE Linux Enterprise Server*", distribution[1]) or \ -- re.match(".*SUSE SLES*", distribution[1]): +- re.match(".*SUSE SLES*", distribution[1]): - dclass = SLESDistro - if distro_version is None: - distro_version = _parse_sle_distribution(distribution) @@ -917,7 +917,7 @@ def getDistroStore(guest, fetcher): stores = [] logging.debug("Finding distro store for location=%s", fetcher.location) -@@ -764,589 +674,6 @@ +@@ -788,597 +698,6 @@ return self.fetcher.acquireFile(self._valid_iso_path) @@ -1265,7 +1265,7 @@ - - # Check for standard 'i386' and 'amd64' which will be - # in the URI name for --location $ISO mounts -- for arch in ["i386", "amd64", "x86_64"]: +- for arch in ["i386", "amd64", "x86_64", "arm64"]: - if arch in self.uri: - logging.debug("Found treearch=%s in uri", arch) - if arch == "x86_64": @@ -1354,9 +1354,17 @@ - return False - - if self.arch == "x86_64": -- kernel_initrd_pair = ("install.amd/vmlinuz", "install.amd/initrd.gz") +- kernel_initrd_pair = ("install.amd/vmlinuz", +- "install.amd/initrd.gz") - elif self.arch == "i686": -- kernel_initrd_pair = ("install.386/vmlinuz", "install.386/initrd.gz") +- kernel_initrd_pair = ("install.386/vmlinuz", +- "install.386/initrd.gz") +- elif self.arch == "aarch64": +- kernel_initrd_pair = ("install.a64/vmlinuz", +- "install.a64/initrd.gz") +- elif self.arch == "ppc64le": +- kernel_initrd_pair = ("install/vmlinux", +- "install/initrd.gz") - elif self.arch == "s390x": - kernel_initrd_pair = ("boot/linux_vm", "boot/root.bin") - else: @@ -1427,7 +1435,7 @@ - return False - - if not self.arch == "s390x": -- kernel_initrd_pair = ("linux", "initrd.gz") +- kernel_initrd_pair = ("install/vmlinuz", "install/initrd.gz") - else: - kernel_initrd_pair = ("boot/kernel.ubuntu", "boot/initrd.ubuntu") - @@ -1497,7 +1505,7 @@ - if not self.fetcher.hasFile(".disk/info"): - return False - -- if self._fetchAndMatchRegex(".disk/info", ".*%s.*" % self.name): +- if self._fetchAndMatchRegex(".disk/info", ".*ALT .*"): - return True - - logging.debug("Regex didn't match, not a %s distro", self.name) |