Hello community,
here is the log from the commit of package vm-install for openSUSE:Factory
checked in at 2014-07-18 07:32:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vm-install (Old)
and /work/SRC/openSUSE:Factory/.vm-install.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vm-install"
Changes:
--------
--- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2014-07-02
15:05:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes
2014-07-18 07:32:05.000000000 +0200
@@ -1,0 +2,14 @@
+Thu Jul 07 14:57:11 MDT 2014 - carn...@suse.com
+
+- bnc#885967 - vm-install: missing separating '/' in default
+ virtual disk path
+- bnc#869026 - Build0198: Unable to complete install: 'XML error:
+ No PCI buses available'
+- Version 0.8.27
+
+-------------------------------------------------------------------
+Thu Jul 03 10:34:28 MDT 2014 - carn...@suse.com
+
+- Updated language file ru.po
+
+-------------------------------------------------------------------
Old:
----
vm-install-0.8.26.tar.bz2
New:
----
vm-install-0.8.27.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vm-install.spec ++++++
--- /var/tmp/diff_new_pack.ZveQvc/_old 2014-07-18 07:32:06.000000000 +0200
+++ /var/tmp/diff_new_pack.ZveQvc/_new 2014-07-18 07:32:06.000000000 +0200
@@ -27,12 +27,12 @@
%endif
# For directory ownership:
BuildRequires: yast2
-Version: 0.8.26
+Version: 0.8.27
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.26.tar.bz2
+Source0: %{name}-0.8.27.tar.bz2
Source1: vm-install.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 s390x ppc64le
++++++ vm-install-0.8.26.tar.bz2 -> vm-install-0.8.27.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.8.26/Makefile
new/vm-install-0.8.27/Makefile
--- old/vm-install-0.8.26/Makefile 2014-06-27 01:37:13.000000000 +0200
+++ new/vm-install-0.8.27/Makefile 2014-07-10 23:37:56.000000000 +0200
@@ -1,5 +1,5 @@
PACKAGE = vm-install
-VER = 0.8.26
+VER = 0.8.27
default:
@echo "Run 'make install DESTDIR=$destdir' to install."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.8.26/po/ru.po
new/vm-install-0.8.27/po/ru.po
--- old/vm-install-0.8.26/po/ru.po 2014-06-12 05:45:39.000000000 +0200
+++ new/vm-install-0.8.27/po/ru.po 2014-07-03 18:33:47.000000000 +0200
@@ -6,7 +6,7 @@
"Project-Id-Version: xen-vm-install\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-05-08 18:43-0600\n"
-"PO-Revision-Date: 2014-06-06 16:09\n"
+"PO-Revision-Date: 2014-07-03 14:03\n"
"Last-Translator: Novell language <langu...@novell.com>\n"
"Language-Team: Novell language <langu...@novell.com>\n"
"Language: \n"
@@ -983,7 +983,7 @@
#: src/vminstall/msg.py:325
msgid "MAC Address"
-msgstr "MAC адрес"
+msgstr "MAC-адрес"
#: src/vminstall/msg.py:326
msgid "Randomly generated MAC address"
@@ -1132,4 +1132,3 @@
#: src/vminstall/msg.py:382
msgid "A hypervisor is not running. For kvm, load the kvm kernel modules. If
you want to run xen, reboot and load the xen kernel."
msgstr "Гипервизор не запущен. Для kvm загрузите соответствующие модули ядра.
Если требуется запустить xen, выполните перезагрузку и загрузите ядро с xen."
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.8.26/setup.py
new/vm-install-0.8.27/setup.py
--- old/vm-install-0.8.26/setup.py 2014-06-27 01:37:09.000000000 +0200
+++ new/vm-install-0.8.27/setup.py 2014-07-10 23:37:52.000000000 +0200
@@ -1,7 +1,7 @@
from distutils.core import setup
setup(name='vminstall',
- version='0.8.26',
+ version='0.8.27',
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.8.26/src/vmdisks/disks.py
new/vm-install-0.8.27/src/vmdisks/disks.py
--- old/vm-install-0.8.26/src/vmdisks/disks.py 2014-06-26 18:20:49.000000000
+0200
+++ new/vm-install-0.8.27/src/vmdisks/disks.py 2014-07-10 22:58:57.000000000
+0200
@@ -35,6 +35,7 @@
import vminstall.paths
import vminstall.util
import vminstall.caps
+import vminstall.hypervisor
def get_fv_boot_disks(disks):
"""Qemu can only boot from the first hard disk or first cdrom.
@@ -201,10 +202,14 @@
# NOTE: Some versions of Xen have a bug that affects detaching. 'xvda'
# may fail to detach, but '51712' works ok. To be safe, the
# numeric form is always used.
- if vminstall.util.is_xend_running():
- vminstall.util.run(['/usr/sbin/xm', 'block-detach', '0',
str(frontdev), '-f'])
- else:
- vminstall.util.run(['/usr/sbin/xl', 'block-detach', '0',
str(frontdev), '-f'])
+ try:
+ if vminstall.util.is_xend_running():
+ vminstall.util.run(['/usr/sbin/xm', 'block-detach', '0',
str(frontdev), '-f'])
+ else:
+ vminstall.util.run(['/usr/sbin/xl', 'block-detach', '0',
str(frontdev), '-f'])
+ except:
+ log.debug("block-detach failed for %s" % str(frontdev))
+ pass
class Driver:
def __init__(self, name):
@@ -1091,7 +1096,7 @@
try:
disk_type = proto2disktype[vals[0]]
except KeyError,e:
- if vminstall.caps.is_kvm() or vminstall.caps.is_qemu():
+ if vminstall.caps.is_kvm() or vminstall.caps.is_qemu() or
vminstall.hypervisor.connection.use_libvirt is True:
disk_type = 'file'
else:
disk_type = vals[0]
@@ -1109,7 +1114,7 @@
cache_mode = " cache='" + self._cache_mode + "'"
else:
cache_mode = ""
- if vminstall.caps.is_kvm() or vminstall.caps.is_qemu():
+ if vminstall.caps.is_kvm() or vminstall.caps.is_qemu() or
vminstall.hypervisor.connection.use_libvirt is True:
if vals[0] == "file" or vals[0] == "raw":
opts.append("<driver name='qemu' type='raw'%s/>" %
cache_mode)
elif vals[0] != "phy":
@@ -1122,7 +1127,10 @@
else:
opts.append("<driver name='%s'/>" % vals[0])
else:
- opts.append("<driver name='%s' type='%s'/>" % (vals[0], vals[1]))
+ if vals[0] == "tap" and vals[1] == "file":
+ opts.append("<driver name='%s' type='raw'/>" % vals[0])
+ else:
+ opts.append("<driver name='%s' type='%s'/>" % (vals[0],
vals[1]))
#
# Source tag
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vm-install-0.8.26/src/vminstall/full_virt_kvm_guest.py
new/vm-install-0.8.27/src/vminstall/full_virt_kvm_guest.py
--- old/vm-install-0.8.26/src/vminstall/full_virt_kvm_guest.py 2014-02-21
15:26:09.000000000 +0100
+++ new/vm-install-0.8.27/src/vminstall/full_virt_kvm_guest.py 2014-07-08
00:14:49.000000000 +0200
@@ -32,6 +32,8 @@
}
self._qemu = '/usr/bin/qemu'
if caps.is_kvm():
+ if caps.kvm_arch() == 's390x':
+ self._qemu = '/usr/bin/qemu-system-s390x'
if os.path.exists("/usr/bin/qemu-system-x86_64"):
self._qemu = '/usr/bin/qemu-system-x86_64'
elif os.path.exists("/usr/bin/qemu-kvm"):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.8.26/src/vminstall/paths.py
new/vm-install-0.8.27/src/vminstall/paths.py
--- old/vm-install-0.8.26/src/vminstall/paths.py 2014-06-12
05:43:18.000000000 +0200
+++ new/vm-install-0.8.27/src/vminstall/paths.py 2014-07-10
18:36:54.000000000 +0200
@@ -97,6 +97,8 @@
# Use the path from /etc/default/vm-install file if specified
if default_path:
imagedir = default_path
+ if not imagedir.endswith('/'):
+ imagedir = imagedir + '/'
return
# Need a connection to libvirt to get 'default' libvirt storage pool path
@@ -106,7 +108,7 @@
virConn = hypervisor.connection.getconn()
# Use the fallback path should the lookup fail below
- imagedir='/usr/lib/libvirt/images'
+ imagedir='/var/lib/libvirt/images/'
try:
virSP = virConn.storagePoolLookupByName('default')
except:
@@ -124,6 +126,8 @@
imagedir = poolpath[0].getContent()
finally:
doc.freeDoc()
+ if not imagedir.endswith('/'):
+ imagedir = imagedir + '/'
#-------------------------------------------------------------------------------
# Function: load_kvm_paths
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
