Hello community,
here is the log from the commit of package vm-install for openSUSE:11.4
checked in at Tue Jul 26 17:13:23 CEST 2011.
--------
--- old-versions/11.4/UPDATES/all/vm-install/vm-install.changes 2011-04-29
22:59:09.000000000 +0200
+++ 11.4/vm-install/vm-install.changes 2011-07-25 18:57:02.000000000 +0200
@@ -1,0 +2,6 @@
+Tue May 10 06:47:41 MDT 2011 - carn...@novell.com
+
+- bnc#692625 - virt-manager has problems to install guest from
+ multiple CD
+
+-------------------------------------------------------------------
calling whatdependson for 11.4-i586
Old:
----
vm-install-0.4.30.tar.bz2
New:
----
vm-install-0.4.31.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vm-install.spec ++++++
--- /var/tmp/diff_new_pack.akVFK4/_old 2011-07-26 17:13:05.000000000 +0200
+++ /var/tmp/diff_new_pack.akVFK4/_new 2011-07-26 17:13:05.000000000 +0200
@@ -26,10 +26,10 @@
License: GPLv2+
Group: System/Emulators/PC
AutoReqProv: yes
-Version: 0.4.30
+Version: 0.4.31
Release: 0.<RELEASE2>
Summary: Tool to Define a Virtual Machine and Install Its Operating
System
-Source0: %{name}-0.4.30.tar.bz2
+Source0: %{name}-0.4.31.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
Requires: libvirt python-urlgrabber libxml2-python libvirt-python
virt-utils udhcp tftp
++++++ vm-install-0.4.30.tar.bz2 -> vm-install-0.4.31.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.4.30/Makefile
new/vm-install-0.4.31/Makefile
--- old/vm-install-0.4.30/Makefile 2011-04-25 17:52:32.000000000 +0200
+++ new/vm-install-0.4.31/Makefile 2011-05-10 15:10:15.000000000 +0200
@@ -1,5 +1,5 @@
PACKAGE = vm-install
-VER = 0.4.30
+VER = 0.4.31
default:
@echo "Run 'make install DESTDIR=$destdir' to install."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.4.30/setup.py
new/vm-install-0.4.31/setup.py
--- old/vm-install-0.4.30/setup.py 2011-04-25 17:52:25.000000000 +0200
+++ new/vm-install-0.4.31/setup.py 2011-05-10 15:10:05.000000000 +0200
@@ -1,7 +1,7 @@
from distutils.core import setup
setup(name='vminstall',
- version='0.4.30',
+ version='0.4.31',
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.4.30/src/vmdisks/disks.py
new/vm-install-0.4.31/src/vmdisks/disks.py
--- old/vm-install-0.4.30/src/vmdisks/disks.py 2011-03-04 16:45:19.000000000
+0100
+++ new/vm-install-0.4.31/src/vmdisks/disks.py 2011-05-10 15:11:48.000000000
+0200
@@ -1033,16 +1033,13 @@
else:
if self._vdevType == self.DEVICE_CDROM and
self.vdev.startswith('vd'):
target_dev = None
- # Default to hdc for the first cdrom
- if available_cdroms['hdc'] == 0:
- target_dev = "hdc"
- available_cdroms['hdc'] = 1
- else:
- for cd in available_cdroms:
- if available_cdroms[cd] == 0:
- target_dev = cd
- available_cdroms[cd] = 1
- break
+ # Grab the lowest available cdrom
+ for cd in available_cdroms:
+ key = cd.keys()[0]
+ if cd[key] == 0:
+ target_dev = key
+ cd[key] = 1
+ break
if not target_dev:
target_string = "<target dev='hd" +
self.vdev[len(self.vdev)-1] + "'/>"
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.4.30/src/vminstall/kvm_guest.py
new/vm-install-0.4.31/src/vminstall/kvm_guest.py
--- old/vm-install-0.4.30/src/vminstall/kvm_guest.py 2011-02-10
00:13:28.000000000 +0100
+++ new/vm-install-0.4.31/src/vminstall/kvm_guest.py 2011-05-10
15:02:15.000000000 +0200
@@ -76,7 +76,7 @@
def _get_disk_xml(self):
"""Get the disk config in the libvirt XML format"""
- available_cdroms = { 'hda': 0, 'hdb':0, 'hdc':0, 'hdd':0 }
+ available_cdroms = [{'hda': 0}, {'hdb': 0}, {'hdc': 0}, {'hdd': 0}]
ret = []
for disk in self.options.disks + self.tmpdisks:
use_virtio = self.options.virtio and disk.virtio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
