Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2019-02-02 21:50:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vm-install (Old) and /work/SRC/openSUSE:Factory/.vm-install.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vm-install" Sat Feb 2 21:50:10 2019 rev:167 rq:670623 version:0.10.06 Changes: -------- --- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2018-12-05 09:46:22.708509541 +0100 +++ /work/SRC/openSUSE:Factory/.vm-install.new.28833/vm-install.changes 2019-02-02 21:50:13.179930380 +0100 @@ -1,0 +2,7 @@ +Fri Feb 1 09:59:17 MST 2019 - [email protected] + +- bsc#1123942 - [XEN][Build157.1] failed to open file + '/usr/lib/grub2/x86_64-xen/grub.xen during bootup PV guest +- Version 0.10.06 + +------------------------------------------------------------------- Old: ---- vm-install-0.10.05.tar.bz2 New: ---- vm-install-0.10.06.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.gRwCbJ/_old 2019-02-02 21:50:13.679929947 +0100 +++ /var/tmp/diff_new_pack.gRwCbJ/_new 2019-02-02 21:50:13.679929947 +0100 @@ -1,7 +1,7 @@ # # spec file for package vm-install # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # 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.05 +Version: 0.10.06 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.05.tar.bz2 +Source0: %{name}-0.10.06.tar.bz2 Source1: vm-install.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdump ++++++ vm-install-0.10.05.tar.bz2 -> vm-install-0.10.06.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.10.05/Makefile new/vm-install-0.10.06/Makefile --- old/vm-install-0.10.05/Makefile 2018-11-27 19:03:32.097279030 +0100 +++ new/vm-install-0.10.06/Makefile 2019-02-01 18:15:08.047100925 +0100 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.10.05 +VER = 0.10.06 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.10.05/setup.py new/vm-install-0.10.06/setup.py --- old/vm-install-0.10.05/setup.py 2018-11-27 19:03:28.233426505 +0100 +++ new/vm-install-0.10.06/setup.py 2019-02-01 18:15:07.967104083 +0100 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.10.05', + version='0.10.06', description='Define a virtual machine and install its operating system', author='Charles Coffing', author_email='[email protected]', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.10.05/src/vminstall/ParaVirtGuest.py new/vm-install-0.10.06/src/vminstall/ParaVirtGuest.py --- old/vm-install-0.10.05/src/vminstall/ParaVirtGuest.py 2018-01-30 17:22:39.090403647 +0100 +++ new/vm-install-0.10.06/src/vminstall/ParaVirtGuest.py 2019-02-01 19:37:06.189362405 +0100 @@ -420,9 +420,13 @@ self.options.os_type == "opensuse13" or self.options.os_type == "opensuse42" or \ self.options.os_type == "opensuse15" or self.options.os_type == "opensuse_tumbleweed" or \ self.options.os_type == "rhel7": + if os.path.exists("/usr/share/grub2/x86_64-xen/grub.xen"): + grub_xen = "/usr/share/grub2/x86_64-xen/grub.xen" + else: + grub_xen = "/usr/lib/grub2/x86_64-xen/grub.xen" return [ "<os type='%s'>" % self.options.os_type, [ '<type>linux</type>', - '<kernel>/usr/lib/grub2/x86_64-xen/grub.xen</kernel>', + '<kernel>%s</kernel>' % grub_xen, '<cmdline>%s %s</cmdline>' % (self.options._runtime_args, self.options.extra_args) ], '</os>' ] return [ "<bootloader>%s</bootloader>" % self.options.loader, @@ -487,11 +491,15 @@ self.options.os_type == "opensuse13" or self.options.os_type == "opensuse42" or \ self.options.os_type == "opensuse15" or self.options.os_type == "opensuse_tumbleweed" or \ self.options.os_type == "rhel7": + if os.path.exists("/usr/share/grub2/x86_64-xen/grub.xen"): + grub_xen = "/usr/share/grub2/x86_64-xen/grub.xen" + else: + grub_xen = "/usr/lib/grub2/x86_64-xen/grub.xen" return """type="pv" #bootargs="" #extra="%(runtime_args)s %(extra_args)s" -kernel="/usr/lib/grub2/x86_64-xen/grub.xen" -""" % { 'runtime_args': self.options._runtime_args, 'extra_args': self.options.extra_args } +kernel="%(grub_arg)s" +""" % { 'runtime_args': self.options._runtime_args, 'extra_args': self.options.extra_args, 'grub_arg': grub_xen } if 'pygrub' in self.options.loader: return """type="pv"
