Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2017-04-29 10:53:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vm-install (Old) and /work/SRC/openSUSE:Factory/.vm-install.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vm-install" Sat Apr 29 10:53:23 2017 rev:156 rq:491714 version:0.8.65 Changes: -------- --- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2017-03-31 15:10:22.188899956 +0200 +++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes 2017-04-29 10:53:27.776747986 +0200 @@ -1,0 +2,12 @@ +Mon Apr 24 11:00:22 MDT 2017 - [email protected] + +- bsc#1035779 - - vm-install: Add support for openSUSE15 and SLE15 +- Version 0.8.65 + +------------------------------------------------------------------- +Wed Apr 12 10:51:37 MDT 2017 - [email protected] + +- bsc#1033845 - fix parsing the os-release file +- Version 0.8.64 + +------------------------------------------------------------------- Old: ---- vm-install-0.8.63.tar.bz2 New: ---- vm-install-0.8.65.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.a8aYs2/_old 2017-04-29 10:53:28.516643462 +0200 +++ /var/tmp/diff_new_pack.a8aYs2/_new 2017-04-29 10:53:28.516643462 +0200 @@ -27,12 +27,12 @@ %endif # For directory ownership: BuildRequires: yast2 -Version: 0.8.63 +Version: 0.8.65 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.8.63.tar.bz2 +Source0: %{name}-0.8.65.tar.bz2 Source1: vm-install.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: dbus-1-python ++++++ vm-install-0.8.63.tar.bz2 -> vm-install-0.8.65.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.63/Makefile new/vm-install-0.8.65/Makefile --- old/vm-install-0.8.63/Makefile 2017-03-29 20:33:56.035755389 +0200 +++ new/vm-install-0.8.65/Makefile 2017-04-24 18:59:29.039005563 +0200 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.8.63 +VER = 0.8.65 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.63/setup.py new/vm-install-0.8.65/setup.py --- old/vm-install-0.8.63/setup.py 2017-03-29 20:33:51.923911277 +0200 +++ new/vm-install-0.8.65/setup.py 2017-04-24 18:59:23.207226680 +0200 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.8.63', + version='0.8.65', 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.8.63/src/vminstall/ParaVirtGuest.py new/vm-install-0.8.65/src/vminstall/ParaVirtGuest.py --- old/vm-install-0.8.63/src/vminstall/ParaVirtGuest.py 2017-01-25 19:09:44.534730986 +0100 +++ new/vm-install-0.8.65/src/vminstall/ParaVirtGuest.py 2017-04-24 19:09:39.395863133 +0200 @@ -290,7 +290,7 @@ else: vpart = traildigits(partition['name']) log.info("Found kernel on partition %s." % vpart) - boot_kernel_check = ['sles12', 'sled12', 'sles11','sled11','opensuse11','opensuse12','opensuse13','opensuse42'] + 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: @@ -398,10 +398,10 @@ if self.runtime['initrd']: ramdisk = ',%s' % self.runtime['initrd'] if self.options.verify_disk_bootable or \ - self.options.os_type == "sles12" or \ - self.options.os_type == "sled12" or \ - self.options.os_type == "opensuse13" or \ - self.options.os_type == "opensuse42" or \ + self.options.os_type == "sles15" or self.options.os_type == "sled15" or \ + self.options.os_type == "sles12" or self.options.os_type == "sled12" or \ + self.options.os_type == "opensuse13" or self.options.os_type == "opensuse42" or \ + self.options.os_type == "opensuse15" or self.options.os_type == "opensuse_tumbleweed" \ self.options.os_type == "rhel7": return [ "<os type='%s'>" % self.options.os_type, [ '<type>linux</type>', @@ -465,10 +465,10 @@ if self.runtime['initrd']: ramdisk = ',%s' % self.runtime['initrd'] if self.options.verify_disk_bootable or \ - self.options.os_type == "sles12" or \ - self.options.os_type == "sled12" or \ - self.options.os_type == "opensuse13" or \ - self.options.os_type == "opensuse42" or \ + self.options.os_type == "sles15" or self.options.os_type == "sled15" or \ + self.options.os_type == "sles12" or self.options.os_type == "sled12" or \ + self.options.os_type == "opensuse13" or self.options.os_type == "opensuse42" or \ + self.options.os_type == "opensuse15" or self.options.os_type == "opensuse_tumbleweed" \ self.options.os_type == "rhel7": return """builder="linux" #bootargs="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.63/src/vminstall/VMDefaults.py new/vm-install-0.8.65/src/vminstall/VMDefaults.py --- old/vm-install-0.8.63/src/vminstall/VMDefaults.py 2017-01-25 19:09:44.542730678 +0100 +++ new/vm-install-0.8.65/src/vminstall/VMDefaults.py 2017-04-24 18:49:05.002666663 +0200 @@ -306,6 +306,12 @@ def default_memory(self): return 1024 +class openSUSE15Defaults(openSUSE13Defaults): + def name(self): + return msg.opensuse15 + def default_memory(self): + return 1024 + class openSUSETumbleweedDefaults(openSUSE13Defaults): def name(self): return msg.opensuse_tumbleweed @@ -418,6 +424,10 @@ def direct_kernel_boot(self): return True +class SLED15Defaults(SLED12Defaults): + def name(self): + return msg.sled15 + class SLES8Defaults(SUSEDefaults): def name(self): return msg.sles8 @@ -526,6 +536,10 @@ def direct_kernel_boot(self): return True +class SLES15Defaults(SLES12Defaults): + def name(self): + return msg.sles15 + class UbuntuDefaults(LinuxDefaults): def group(self): return 'ubuntu' @@ -932,6 +946,7 @@ 'opensuse12' : openSUSE12Defaults(), 'opensuse13' : openSUSE13Defaults(), 'opensuse42' : openSUSE42Defaults(), + 'opensuse15' : openSUSE15Defaults(), 'opensuse_tumbleweed' : openSUSETumbleweedDefaults(), 'other' : GenericDefaults(), 'redhat' : RedHatDefaults(), @@ -943,9 +958,11 @@ 'sled10' : SLED10Defaults(), 'sled11' : SLED11Defaults(), 'sled12' : SLED12Defaults(), + 'sled15' : SLED15Defaults(), 'sles10' : SLES10Defaults(), 'sles11' : SLES11Defaults(), 'sles12' : SLES12Defaults(), + 'sles15' : SLES15Defaults(), 'sles8' : SLES8Defaults(), 'sles9' : SLES9Defaults(), 'suse' : SUSEDefaults(), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.63/src/vminstall/VMLinux.py new/vm-install-0.8.65/src/vminstall/VMLinux.py --- old/vm-install-0.8.63/src/vminstall/VMLinux.py 2017-01-25 19:09:44.534730986 +0100 +++ new/vm-install-0.8.65/src/vminstall/VMLinux.py 2017-04-24 19:11:24.703870253 +0200 @@ -45,7 +45,10 @@ if os_type == 'rhel6' or os_type == 'rhel7': kernels = glob.glob('%s%svmlinuz-*' % (root, path)) initrds = glob.glob('%s%sinitramfs-*' % (root, path)) - elif os_type == 'sles12' or os_type == 'opensuse42' or os_type == 'opensuse_tumbleweed': + 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': 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.8.63/src/vminstall/VMSUSE.py new/vm-install-0.8.65/src/vminstall/VMSUSE.py --- old/vm-install-0.8.63/src/vminstall/VMSUSE.py 2017-03-29 20:33:35.716522850 +0200 +++ new/vm-install-0.8.65/src/vminstall/VMSUSE.py 2017-04-24 19:28:56.371994969 +0200 @@ -367,8 +367,10 @@ else: src = 'hd:/dev/%s' % options.source.get_vdev_str() else: - if options.os_type != 'sles12' and options.os_type != 'sled12' \ - and options.os_type != 'opensuse42' and options.os_type != 'opensuse_tumbleweed': + if options.os_type != 'sles15' and options.os_type != 'sled15' \ + and options.os_type != 'sles12' and options.os_type != 'sled12' \ + and options.os_type != 'opensuse42' and options.os_type != 'opensuse15' \ + and options.os_type != 'opensuse_tumbleweed': src = 'hd:/dev/%s' % options.source.get_vdev_str() else: src = options.source @@ -386,11 +388,12 @@ if options.direct_kernel_boot: virtio = False if caps.is_kvm(): - if options.os_type == 'sles12' or options.os_type == 'sled12' or \ + if options.os_type == 'sles15' or options.os_type == 'sled15' or \ + options.os_type == 'sles12' or options.os_type == 'sled12' or \ options.os_type == 'sles11' or options.os_type == 'sled11' or \ options.os_type == 'opensuse11' or options.os_type == 'opensuse12' or \ options.os_type == 'opensuse13' or options.os_type == 'opensuse42' or \ - options.os_type == 'opensuse_tumbleweed': + options.os_type == 'opensuse15' or options.os_type == 'opensuse_tumbleweed': virtio = True autoyast_vdev = "vdb" else: @@ -450,15 +453,12 @@ (fd, tmpdisk) = tempfile.mkstemp(prefix='autoyast.') virtio = False if guest.options.direct_kernel_boot and caps.is_kvm(): - if guest.options.os_type == 'sles12' or \ - guest.options.os_type == 'sled12' or \ - guest.options.os_type == 'sles11' or \ - guest.options.os_type == 'sled11' or \ - guest.options.os_type == 'opensuse11' or \ - guest.options.os_type == 'opensuse12' or \ - guest.options.os_type == 'opensuse13' or \ - guest.options.os_type == 'opensuse42' or \ - guest.options.os_type == 'opensuse_tumbleweed': + if guest.options.os_type == 'sles15' or guest.options.os_type == 'sled15' or \ + guest.options.os_type == 'sles12' or guest.options.os_type == 'sled12' or \ + guest.options.os_type == 'sles11' or guest.options.os_type == 'sled11' or \ + guest.options.os_type == 'opensuse11' or guest.options.os_type == 'opensuse12' or \ + guest.options.os_type == 'opensuse13' or guest.options.os_type == 'opensuse42' or \ + guest.options.os_type == 'opensuse15' or guest.options.os_type == 'opensuse_tumbleweed': virtio = True autoyast_vdev = vmdisks.get_unused_vdevs(guest.options.full_virt, virtio, guest.options.disks)[0] ay_vdev = autoyast_vdev diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.63/src/vminstall/caps.py new/vm-install-0.8.65/src/vminstall/caps.py --- old/vm-install-0.8.63/src/vminstall/caps.py 2017-01-25 19:09:44.542730678 +0100 +++ new/vm-install-0.8.65/src/vminstall/caps.py 2017-04-25 00:53:46.385007295 +0200 @@ -246,14 +246,16 @@ if name and version: if name == 'openSUSE Leap': return 'opensuse' + version + if name == 'openSUSE Tumbleweed': + return 'opensuse_tumbleweed' if name == 'openSUSE': int_version = int(version) if int_version is None or int_version > 2014: version = "_tumbleweed" return name.lower() + version - if name.startswith('SUSE Linux Enterprise Server'): + if name.startswith('SLES') or name.startswith('SUSE Linux Enterprise Server'): return 'sles' + version - if name.startswith('SUSE Linux Enterprise Desktop'): + if name.startswith('SLED') or name.startswith('SUSE Linux Enterprise Desktop'): return 'sled' + version break elif os.path.exists('/etc/SuSE-release'): @@ -271,6 +273,8 @@ return 'opensuse13' if line.startswith('openSUSE 42'): return 'opensuse42' + if line.startswith('openSUSE 15'): + return 'opensuse15' if line.startswith('SUSE Linux Enterprise Server 10'): return 'sles10' if line.startswith('SUSE Linux Enterprise Desktop 10'): @@ -283,4 +287,8 @@ return 'sles12' if line.startswith('SUSE Linux Enterprise Desktop 12'): return 'sled12' + if line.startswith('SUSE Linux Enterprise Server 15'): + return 'sles15' + if line.startswith('SUSE Linux Enterprise Desktop 15'): + return 'sled15' return 'sles12' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.63/src/vminstall/gtk/interface.py new/vm-install-0.8.65/src/vminstall/gtk/interface.py --- old/vm-install-0.8.63/src/vminstall/gtk/interface.py 2017-01-25 19:09:43.454772756 +0100 +++ new/vm-install-0.8.65/src/vminstall/gtk/interface.py 2017-04-24 19:13:23.999347020 +0200 @@ -954,7 +954,7 @@ 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', 'opensuse10', 'opensuse11', 'opensuse12', 'opensuse13'): + 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'] @@ -1444,7 +1444,7 @@ log.debug("Validation failed: VM must not be running for an upgrade") self._exc_box(VmError(err=VmError.E_VM_RUNNING)) return - if self.options.os_type in ('sles12', 'sled12'): + if self.options.os_type in ('sles12', 'sled12', 'sles15', 'sled15'): self.options.extra_args = "upgrade=1" # Initialize the internal data from the config file. Do this before calling calculate try: @@ -1975,7 +1975,7 @@ break # Screen Resolution if not self.options.full_virt and \ - self.options.os_type in ('sles10', 'sles11', 'sles12', 'opensuse10', 'opensuse11', 'opensuse12', 'opensuse13'): + 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': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.63/src/vminstall/msg.py new/vm-install-0.8.65/src/vminstall/msg.py --- old/vm-install-0.8.63/src/vminstall/msg.py 2017-01-25 19:09:44.538730831 +0100 +++ new/vm-install-0.8.65/src/vminstall/msg.py 2017-04-24 18:49:41.833270186 +0200 @@ -134,6 +134,7 @@ opensuse12 = _("openSUSE 12") opensuse13 = _("openSUSE 13") opensuse42 = _("openSUSE 42") +opensuse15 = _("openSUSE 15") opensuse_tumbleweed = _("openSUSE Tumbleweed") other_os = _("Other operating system") redhat_other = _("RedHat (other)") @@ -145,9 +146,11 @@ sled10 = _("SUSE Linux Enterprise Desktop 10") sled11 = _("SUSE Linux Enterprise Desktop 11") sled12 = _("SUSE Linux Enterprise Desktop 12") +sled15 = _("SUSE Linux Enterprise Desktop 15") sles10 = _("SUSE Linux Enterprise Server 10") sles11 = _("SUSE Linux Enterprise Server 11") sles12 = _("SUSE Linux Enterprise Server 12") +sles15 = _("SUSE Linux Enterprise Server 15") sles8 = _("SUSE Linux Enterprise Server 8") sles9 = _("SUSE Linux Enterprise Server 9") solaris10 = _("Solaris 10") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.63/src/vminstall/xen_guest.py new/vm-install-0.8.65/src/vminstall/xen_guest.py --- old/vm-install-0.8.63/src/vminstall/xen_guest.py 2017-01-25 19:09:44.538730831 +0100 +++ new/vm-install-0.8.65/src/vminstall/xen_guest.py 2017-04-24 18:53:55.331658483 +0200 @@ -204,7 +204,8 @@ ret += 'model=%s' % ( nic.model, ) needComma = 1 if not self.isInstall: - if self.options.os_type == 'sles12' or self.options.os_type == 'sled12' or \ + if self.options.os_type == 'sles15' or self.options.os_type == 'sled15' or \ + self.options.os_type == 'sles12' or self.options.os_type == 'sled12' or \ self.options.os_type == 'sles11' or self.options.os_type == 'sled11': ret += commas[needComma] ret += 'type=netfront'
