Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2017-09-20 17:12:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vm-install (Old) and /work/SRC/openSUSE:Factory/.vm-install.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vm-install" Wed Sep 20 17:12:59 2017 rev:160 rq:527362 version:0.9.03 Changes: -------- --- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2017-08-16 16:13:54.919685306 +0200 +++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes 2017-09-20 17:13:06.114084339 +0200 @@ -1,0 +2,7 @@ +Thu Aug 31 16:01:36 MDT 2017 - [email protected] + +- bsc#1056738 - vm-install: Can't install SLE15 PV guest on SLE11 + SP4 host +- Version 0.9.03 + +------------------------------------------------------------------- Old: ---- vm-install-0.9.02.tar.bz2 New: ---- vm-install-0.9.03.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.oHIzi0/_old 2017-09-20 17:13:07.361908683 +0200 +++ /var/tmp/diff_new_pack.oHIzi0/_new 2017-09-20 17:13:07.361908683 +0200 @@ -28,12 +28,12 @@ %endif # For directory ownership: BuildRequires: yast2 -Version: 0.9.02 +Version: 0.9.03 Release: 0 Summary: Tool to Define a Virtual Machine and Install Its Operating System License: GPL-2.0 Group: System/Emulators/PC -Source0: %{name}-0.9.02.tar.bz2 +Source0: %{name}-0.9.03.tar.bz2 Source1: vm-install.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: dbus-1-python ++++++ vm-install-0.9.02.tar.bz2 -> vm-install-0.9.03.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.9.02/Makefile new/vm-install-0.9.03/Makefile --- old/vm-install-0.9.02/Makefile 2017-08-10 00:21:30.941675223 +0200 +++ new/vm-install-0.9.03/Makefile 2017-09-06 16:21:56.726685869 +0200 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.9.02 +VER = 0.9.03 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.9.02/setup.py new/vm-install-0.9.03/setup.py --- old/vm-install-0.9.02/setup.py 2017-08-10 00:21:25.769871113 +0200 +++ new/vm-install-0.9.03/setup.py 2017-09-06 16:21:56.418697535 +0200 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.9.02', + version='0.9.03', 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.9.02/src/vminstall/ParaVirtGuest.py new/vm-install-0.9.03/src/vminstall/ParaVirtGuest.py --- old/vm-install-0.9.02/src/vminstall/ParaVirtGuest.py 2017-07-07 00:53:28.089793091 +0200 +++ new/vm-install-0.9.03/src/vminstall/ParaVirtGuest.py 2017-09-06 16:21:56.638689203 +0200 @@ -20,6 +20,7 @@ from .globals import * from .log import log from vmdisks import Disk +from uuid import UUID from . import hypervisor from . import mount from . import paths @@ -107,7 +108,7 @@ partitions = [] # Old version of sfdisk returns Id=... New version returns type= pre_old = re.compile('([^ ]*)[ \\t]*:[ \\t]*start=[ \\t]*([0-9]*)[ \\t]*, size=[ \\t]*([0-9]*)[ \\t]*, Id=[ \\t]*([0-9a-fA-F]*)') - pre = re.compile('([^ ]*)[ \\t]*:[ \\t]*start=[ \\t]*([0-9]*)[ \\t]*, size=[ \\t]*([0-9]*)[ \\t]*, type=[ \\t]*([0-9a-fA-F]*)') + pre = re.compile('([^ ]*)[ \\t]*:[ \\t]*start=[ \\t]*([0-9]*)[ \\t]*, size=[ \\t]*([0-9]*)[ \\t]*, type=[ \\t]*([0-9a-fA-F-]*)') log.debug("Examining '%s' for partitions..." % dev) try: lines = util.run(['/sbin/sfdisk', '--force', '-d', '-uS', '--', dev]) @@ -123,8 +124,13 @@ pstart = m.group(2) pid = m.group(4) # For now, only investigate 83 (Linux) and 6 (FAT16) - if pid not in ('6', '83'): - continue + if pid not in ('6', '83', 'ee'): + # Check if type is GUID for a GPT partition + try: + UUID(pid) + pid = 'ee' + except: + continue log.debug("Found partition '%s'." % (pname,)) partition['name'] = pname partition['id'] = pid @@ -257,7 +263,7 @@ actions = VMDefaults[self.options.os_type].actions() for partition in partitions: # For now, only investigate 6 (FAT16) and 83 (Linux), 8e (Linux LVM) - if partition['id'] not in ('6', '83', '8e'): + if partition['id'] not in ('6', '83', '8e', 'ee'): continue if partition['id'] == '8e': os.system("vgchange -ay '%s' > /dev/null 2>&1" % (partition['vdev'])) @@ -290,7 +296,10 @@ else: vpart = traildigits(partition['name']) log.info("Found kernel on partition %s." % vpart) - boot_kernel_check = ['sles15', 'sled15', 'sles12', 'sled12', 'sles11','sled11','opensuse11','opensuse12','opensuse13','opensuse42', 'opensuse15', 'opensuse_tumbleweed'] + boot_kernel_check = ['sles15', 'sled15', 'sles12', \ + 'sled12', 'sles11','sled11', \ + 'opensuse11','opensuse12','opensuse13', \ + 'opensuse42', 'opensuse15', 'opensuse_tumbleweed'] if self.options.os_type in boot_kernel_check: path = os.path.dirname(_kernel) try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.9.02/src/vminstall/VMDefaults.py new/vm-install-0.9.03/src/vminstall/VMDefaults.py --- old/vm-install-0.9.02/src/vminstall/VMDefaults.py 2017-07-25 22:19:04.839165108 +0200 +++ new/vm-install-0.9.03/src/vminstall/VMDefaults.py 2017-09-06 16:21:56.642689051 +0200 @@ -516,7 +516,7 @@ def default_memory(self): return 1024 def _disk_size(self): - return 8 + return 12 def num_vcpus(self): return caps.vcpu_processors(4) def apic(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.9.02/src/vminstall/VMLinux.py new/vm-install-0.9.03/src/vminstall/VMLinux.py --- old/vm-install-0.9.02/src/vminstall/VMLinux.py 2017-07-07 00:53:28.089793091 +0200 +++ new/vm-install-0.9.03/src/vminstall/VMLinux.py 2017-09-06 16:21:56.638689203 +0200 @@ -46,9 +46,9 @@ kernels = glob.glob('%s%svmlinuz-*' % (root, path)) initrds = glob.glob('%s%sinitramfs-*' % (root, path)) elif os_type == 'sles12' or os_type == 'sled12' or \ - os_type == 'sles15' or os_type == 'sled15' or \ - os_type == 'opensuse42' or os_type == 'opensuse15' or \ - os_type == 'opensuse_tumbleweed': + os_type == 'sles15' or os_type == 'sled15' or \ + os_type == 'opensuse42' or os_type == 'opensuse15' or \ + os_type == 'opensuse_tumbleweed': kernels = glob.glob('%s%svmlinuz-*' % (root, path)) initrds = glob.glob('%s%sinitrd-*' % (root, path)) else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.9.02/src/vminstall/VMSUSE.py new/vm-install-0.9.03/src/vminstall/VMSUSE.py --- old/vm-install-0.9.02/src/vminstall/VMSUSE.py 2017-07-07 00:53:28.093792939 +0200 +++ new/vm-install-0.9.03/src/vminstall/VMSUSE.py 2017-09-06 16:21:56.638689203 +0200 @@ -181,7 +181,7 @@ else: kfn = '/%s/boot/%s/linux' % (mediaroot, a[0]) ifn = '/%s/boot/%s/initrd' % (mediaroot, a[0]) - elif options.direct_kernel_boot: + elif options.direct_kernel_boot or options.os_type == "sles15" or options.os_type == "sled15": if a[0] is not '': k = '/boot/%s/loader/linux' % a[0] kfn = '%s/%s%s' % (root, mediaroot, k) @@ -284,7 +284,7 @@ elif a[0] == 'aarch64' or a[0] == 'ppc64le': kfn = '/%s/boot/%s/linux' % (mediaroot, a[0]) ifn = '/%s/boot/%s/initrd' % (mediaroot, a[0]) - elif options.direct_kernel_boot: + elif options.direct_kernel_boot or options.os_type == "sles15" or options.os_type == "sled15": kfn = '/%s/boot/%s/loader/linux' % (mediaroot, a[0]) ifn = '/%s/boot/%s/loader/initrd' % (mediaroot, a[0]) else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.9.02/src/vminstall/gtk/interface.py new/vm-install-0.9.03/src/vminstall/gtk/interface.py --- old/vm-install-0.9.02/src/vminstall/gtk/interface.py 2017-07-25 23:25:51.003384789 +0200 +++ new/vm-install-0.9.03/src/vminstall/gtk/interface.py 2017-09-06 16:21:56.426697232 +0200 @@ -117,7 +117,9 @@ raise Error(Exception(), vminstall.msg.must_be_root) # Specific to HVM guests - self.has_balloon_driver = ['opensuse11','opensuse12','opensuse13','sled11','sles11'] + self.has_balloon_driver = ['opensuse11','opensuse12','opensuse13',\ + 'opensuse42','opensuse15','opensuse_tumbleweed',\ + 'sled11','sles11','sled12','sles12','sled15','sles15'] if caps.is_xen(): paths.load_xen_paths(options) @@ -954,7 +956,10 @@ self.window.get_widget('graphics_hw_' + self.defaults.graphics).set_active(True) if not self.options.full_virt and \ - self.options.os_type in ('sles10', 'sles11', 'sles12', 'sles15', 'opensuse10', 'opensuse11', 'opensuse12', 'opensuse13', 'opensuse42', 'opensuse15', 'opensuse_tumbleweed'): + self.options.os_type in ('sles10', 'sles11', 'sles12', 'sles15', \ + 'opensuse10', 'opensuse11', 'opensuse12', \ + 'opensuse13', 'opensuse42', 'opensuse15', \ + 'opensuse_tumbleweed'): self.window.get_widget('screen-resolution-alignment').show() combo = self.window.get_widget('graphics-hw-screen-resolution-combobox') sr = ['640x480', '800x600', '1024x768', '1280x1024'] @@ -1975,7 +1980,10 @@ break # Screen Resolution if not self.options.full_virt and \ - self.options.os_type in ('sles10', 'sles11', 'sles12', 'sles15', 'opensuse10', 'opensuse11', 'opensuse12', 'opensuse13', 'opensuse42', 'opensuse15', 'opensuse_tumbleweed'): + self.options.os_type in ('sles10', 'sles11', 'sles12', 'sles15', \ + 'opensuse10', 'opensuse11', 'opensuse12', \ + 'opensuse13', 'opensuse42', 'opensuse15', \ + 'opensuse_tumbleweed'): combo = self.window.get_widget('graphics-hw-screen-resolution-combobox') res = combo.get_active_text() if self.options.screen_resolution or res != '800x600':
