Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package vm-install for openSUSE:Factory
checked in at 2021-02-17 18:08:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vm-install (Old)
and /work/SRC/openSUSE:Factory/.vm-install.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vm-install"
Wed Feb 17 18:08:35 2021 rev:173 rq:870525 version:0.10.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2020-10-30
11:46:40.357654455 +0100
+++ /work/SRC/openSUSE:Factory/.vm-install.new.28504/vm-install.changes
2021-02-17 18:08:37.045797144 +0100
@@ -1,0 +2,8 @@
+Mon Feb 8 15:06:54 MST 2021 - carn...@suse.com
+
+- Fixes for PV PXE booting (jsc#SLE-11885)
+ Fix read of pxelinux.cfg/default after downloading
+ Accept PVOPS kernels as PV bootable kernels
+- Version 0.10.11
+
+-------------------------------------------------------------------
Old:
----
vm-install-0.10.10.tar.bz2
New:
----
vm-install-0.10.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vm-install.spec ++++++
--- /var/tmp/diff_new_pack.X2dERm/_old 2021-02-17 18:08:37.517797530 +0100
+++ /var/tmp/diff_new_pack.X2dERm/_new 2021-02-17 18:08:37.517797530 +0100
@@ -1,7 +1,7 @@
#
# spec file for package vm-install
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,12 +27,12 @@
%endif
# For directory ownership:
BuildRequires: yast2
-Version: 0.10.10
+Version: 0.10.11
Release: 0
Summary: Tool to Define a Virtual Machine and Install Its Operating
System
License: GPL-2.0-only
Group: System/Emulators/PC
-Source0: %{name}-0.10.10.tar.bz2
+Source0: %{name}-0.10.11.tar.bz2
Source1: vm-install.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: kdump
++++++ vm-install-0.10.10.tar.bz2 -> vm-install-0.10.11.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.10.10/Makefile
new/vm-install-0.10.11/Makefile
--- old/vm-install-0.10.10/Makefile 2020-10-22 23:13:21.384421870 +0200
+++ new/vm-install-0.10.11/Makefile 2021-02-08 23:24:25.672927489 +0100
@@ -1,5 +1,5 @@
PACKAGE = vm-install
-VER = 0.10.10
+VER = 0.10.11
default:
@echo "Run 'make install DESTDIR=$destdir' to install."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.10.10/setup.py
new/vm-install-0.10.11/setup.py
--- old/vm-install-0.10.10/setup.py 2020-10-22 23:13:18.028421788 +0200
+++ new/vm-install-0.10.11/setup.py 2021-02-08 23:24:29.272927570 +0100
@@ -1,7 +1,7 @@
from distutils.core import setup
setup(name='vminstall',
- version='0.10.10',
+ version='0.10.11',
description='Define a virtual machine and install its operating system',
author='Charles Coffing',
author_email='ccoff...@novell.com',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.10.10/src/vminstall/VMPXE.py
new/vm-install-0.10.11/src/vminstall/VMPXE.py
--- old/vm-install-0.10.10/src/vminstall/VMPXE.py 2020-10-22
23:06:56.308412455 +0200
+++ new/vm-install-0.10.11/src/vminstall/VMPXE.py 2021-02-08
23:27:07.320931140 +0100
@@ -166,7 +166,7 @@
raise e
os.chdir(vminstall.paths.imagedir)
if tftp_flag is True:
- commandstr=["tftp", servaddr, "-c", "get", "pxelinux.cfg/default",
"/dev/stdout"]
+ commandstr=["tftp", servaddr, "-c", "get", "pxelinux.cfg/default"]
else:
commandstr=["atftp", "-g", "-r", "pxelinux.cfg/default", "-l",
"default", servaddr]
cfgfilename="default"
@@ -241,17 +241,20 @@
kernel_out=subprocess.check_output(cmd_config,
universal_newlines=True, stderr=subprocess.STDOUT)
except Exception as e:
raise PXEError(PXEError.E_NO_KERNEL)
- lines=kernel_out.split('\n')
- success=0
- for line in lines:
- if re.match("CONFIG_X86_.*_XEN=y", line):
- success=1
- break
- if success == 0:
- # The downloaded kernel is not xen-enabled
- log.debug("Kernel provided by PXE is not xen-enabled.")
- os.unlink(self.kfn)
- os.unlink(self.ifn)
+ # Beginning with SLE12-SP2 only the PVOPS kernel exists.
+ # Their is no longer a xen specific kernel built with
CONFIG_X86_.*_XEN=y
+ if options.os_type == 'sles11' or options.os_type == 'sled11':
+ lines=kernel_out.split('\n')
+ success=0
+ for line in lines:
+ if re.match("CONFIG_X86_.*_XEN=y", line):
+ success=1
+ break
+ if success == 0:
+ # The downloaded kernel is not xen-enabled
+ log.debug("Kernel provided by PXE is not xen-enabled.")
+ os.unlink(self.kfn)
+ os.unlink(self.ifn)
if success == 1:
log.debug("Using installation kernel/initrd provided by PXE: %s
%s" % (self.kfn, self.ifn))
