Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2017-03-31 15:10:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vm-install (Old) and /work/SRC/openSUSE:Factory/.vm-install.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vm-install" Fri Mar 31 15:10:02 2017 rev:155 rq:483462 version:0.8.63 Changes: -------- --- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2017-03-11 15:19:38.415526046 +0100 +++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes 2017-03-31 15:10:22.188899956 +0200 @@ -1,0 +2,13 @@ +Wed Mar 29 12:34:10 MDT 2017 - [email protected] + +- bsc#1027106 - ISO based installations of Xen PV guests do not + automatically find the installation sources +- Version 0.8.63 + +------------------------------------------------------------------- +Wed Mar 15 15:39:50 MDT 2017 - [email protected] + +- Fix initializing the host installation source location +- Version 0.8.62 + +------------------------------------------------------------------- Old: ---- vm-install-0.8.61.tar.bz2 New: ---- vm-install-0.8.63.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.Vnf5Lb/_old 2017-03-31 15:10:23.048778385 +0200 +++ /var/tmp/diff_new_pack.Vnf5Lb/_new 2017-03-31 15:10:23.052777819 +0200 @@ -27,12 +27,12 @@ %endif # For directory ownership: BuildRequires: yast2 -Version: 0.8.61 +Version: 0.8.63 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.61.tar.bz2 +Source0: %{name}-0.8.63.tar.bz2 Source1: vm-install.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: dbus-1-python ++++++ vm-install-0.8.61.tar.bz2 -> vm-install-0.8.63.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.61/Makefile new/vm-install-0.8.63/Makefile --- old/vm-install-0.8.61/Makefile 2017-03-03 18:09:03.739972862 +0100 +++ new/vm-install-0.8.63/Makefile 2017-03-29 20:33:56.035755389 +0200 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.8.61 +VER = 0.8.63 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.61/setup.py new/vm-install-0.8.63/setup.py --- old/vm-install-0.8.61/setup.py 2017-03-03 18:09:03.715973771 +0100 +++ new/vm-install-0.8.63/setup.py 2017-03-29 20:33:51.923911277 +0200 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.8.61', + version='0.8.63', 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.61/src/vminstall/VMSUSE.py new/vm-install-0.8.63/src/vminstall/VMSUSE.py --- old/vm-install-0.8.61/src/vminstall/VMSUSE.py 2017-01-25 19:09:44.538730831 +0100 +++ new/vm-install-0.8.63/src/vminstall/VMSUSE.py 2017-03-29 20:33:35.716522850 +0200 @@ -359,6 +359,7 @@ global autoyast_vdev args = VMLinux.getInstallArgs(self, options) if options.source: + src = "" if type(options.source) is vmdisks.Disk: if options.full_virt: if options.source.get_vdevtype() == 'cdrom' and options.direct_kernel_boot: @@ -366,10 +367,13 @@ else: src = 'hd:/dev/%s' % options.source.get_vdev_str() else: - src = 'hd:/dev/%s' % options.source.get_vdev_str() + if options.os_type != 'sles12' and options.os_type != 'sled12' \ + and options.os_type != 'opensuse42' and options.os_type != 'opensuse_tumbleweed': + src = 'hd:/dev/%s' % options.source.get_vdev_str() else: src = options.source - args += ' install=%s' % src + if src != "": + args += ' install=%s' % src ay = options.os_settings if ay: if ay.startswith('ftp://') or ay.startswith('tftp://') or \ @@ -385,7 +389,8 @@ if 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': + options.os_type == 'opensuse13' or options.os_type == 'opensuse42' or \ + options.os_type == 'opensuse_tumbleweed': virtio = True autoyast_vdev = "vdb" else: @@ -452,7 +457,8 @@ guest.options.os_type == 'opensuse11' or \ guest.options.os_type == 'opensuse12' or \ guest.options.os_type == 'opensuse13' or \ - guest.options.os_type == 'opensuse42': + guest.options.os_type == 'opensuse42' 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.61/src/vminstall/util.py new/vm-install-0.8.63/src/vminstall/util.py --- old/vm-install-0.8.61/src/vminstall/util.py 2017-01-25 19:09:44.538730831 +0100 +++ new/vm-install-0.8.63/src/vminstall/util.py 2017-03-15 22:38:21.976139450 +0100 @@ -267,15 +267,16 @@ repo_url = repo_url + server_dir _host_repo_url = repo_url return repo_url + else: + (_,zypper_output) = lookupZypperRepos() + if len(zypper_output): + _host_repo_url = zypper_output[0] + return _host_repo_url return None -def getInstallSources(enabled_sources_only = False): - dom0_inst_source = getDom0InstallSource() +def lookupZypperRepos(dom0_inst_source=None): try: - if enabled_sources_only is True: - cmd = '/usr/bin/zypper lr -u -E' - else: - cmd = '/usr/bin/zypper lr -u' + cmd = '/usr/bin/zypper lr -u -E -P' zypper_output = commands.getoutput(cmd) zypper_list = zypper_output.split("\n") zypper_header = [x.strip(' ') for x in zypper_list[0].split("|")] @@ -299,11 +300,18 @@ index_dom0 = number_of_sources number_of_sources += 1 - if index_dom0 == -1 and dom0_inst_source: - index_dom0 = 0 - zypper_output.insert(0, dom0_inst_source) + if index_dom0 == -1: + if dom0_inst_source: + index_dom0 = 0 + zypper_output.insert(0, dom0_inst_source) + elif len(zypper_output): + index_dom0 = 0 + dom0_inst_source = zypper_output[0] return (index_dom0, zypper_output) +def getInstallSources(): + return lookupZypperRepos(getDom0InstallSource()) + def get_running_vms(): managed_vms = [] use_virsh = False
