commit vm-install for openSUSE:11.3
Hello community,
here is the log from the commit of package vm-install for openSUSE:11.3
checked in at Mon Oct 10 16:49:04 CEST 2011.
--- old-versions/11.3/UPDATES/all/vm-install/vm-install.changes 2011-07-25
18:56:48.0 +0200
+++ 11.3/vm-install/vm-install.changes 2011-10-07 21:55:39.0 +0200
@@ -1,0 +2,5 @@
+Tue Aug 23 14:13:43 MDT 2011 - carn...@novell.com
+
+- bnc#722794 - Support for RHEL 6 is missing from vm-install
+
+---
calling whatdependson for 11.3-i586
Old:
vm-install-0.4.31.tar.bz2
New:
vm-install-0.4.32.tar.bz2
Other differences:
--
++ vm-install.spec ++
--- /var/tmp/diff_new_pack.V1Njyz/_old 2011-10-10 16:48:49.0 +0200
+++ /var/tmp/diff_new_pack.V1Njyz/_new 2011-10-10 16:48:49.0 +0200
@@ -23,13 +23,13 @@
BuildRequires: python-devel update-desktop-files
# For directory ownership:
BuildRequires: yast2
-License:GPLv2+
+License:GPL v2 or later
Group: System/Emulators/PC
AutoReqProv:yes
-Version:0.4.31
+Version:0.4.32
Release:0.RELEASE2
Summary:Tool to Define a Virtual Machine and Install Its Operating
System
-Source0:%{name}-0.4.31.tar.bz2
+Source0:%{name}-0.4.32.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.31.tar.bz2 - vm-install-0.4.32.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.4.31/Makefile
new/vm-install-0.4.32/Makefile
--- old/vm-install-0.4.31/Makefile 2011-05-10 14:50:28.0 +0200
+++ new/vm-install-0.4.32/Makefile 2011-10-07 21:47:52.0 +0200
@@ -1,5 +1,5 @@
PACKAGE = vm-install
-VER = 0.4.31
+VER = 0.4.32
default:
@echo Run 'make install DESTDIR=$destdir' to install.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.4.31/setup.py
new/vm-install-0.4.32/setup.py
--- old/vm-install-0.4.31/setup.py 2011-05-10 14:50:15.0 +0200
+++ new/vm-install-0.4.32/setup.py 2011-10-07 21:47:45.0 +0200
@@ -1,7 +1,7 @@
from distutils.core import setup
setup(name='vminstall',
- version='0.4.31',
+ version='0.4.32',
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.31/src/vminstall/VMDefaults.py
new/vm-install-0.4.32/src/vminstall/VMDefaults.py
--- old/vm-install-0.4.31/src/vminstall/VMDefaults.py 2011-04-25
17:37:23.0 +0200
+++ new/vm-install-0.4.32/src/vminstall/VMDefaults.py 2011-10-07
21:42:21.0 +0200
@@ -177,6 +177,23 @@
def num_vcpus(self):
return caps.vcpu_processors(1)
+class RHEL6Defaults(RedHatDefaults):
+def name(self):
+return msg.rhel6
+def virt_support(self):
+return ('hvm', 'xen')
+def min_memory(self):
+return 512
+def max_memory(self):
+return self.default_memory()
+#return 16*1024
+def _disk_size(self):
+return 8
+def disks(self):
+return [ self._disk_template(0, self._disk_size()) ]
+def num_vcpus(self):
+return caps.vcpu_processors(1)
+
class SUSEDefaults(LinuxDefaults):
def group(self):
return 'suse'
@@ -564,6 +581,7 @@
'rhel3': RHEL3Defaults(),
'rhel4': RHEL4Defaults(),
'rhel5': RHEL5Defaults(),
+'rhel6': RHEL6Defaults(),
'sled10' : SLED10Defaults(),
'sled11' : SLED11Defaults(),
'sles10' : SLES10Defaults(),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.4.31/src/vminstall/VMRedHat.py
new/vm-install-0.4.32/src/vminstall/VMRedHat.py
--- old/vm-install-0.4.31/src/vminstall/VMRedHat.py 2010-08-06
23:43:57.0 +0200
+++ new/vm-install-0.4.32/src/vminstall/VMRedHat.py 2011-10-07
21:44:54.0 +0200
@@ -49,7 +49,7 @@
Retrieves a Xen-enabled RedHat kernel and initrd from the URL, and
copies them to temporary files. Returns the (kernel, initrd) tuple of
filenames.
-kfd = ifd = None
+kfd = ifd = kfn = None
try:
try:
if url.startswith('http://') or url.startswith('ftp://'):
@@ -73,7 +73,8 @@
try:
ifn = util.copy_to_temp(ifd, prefix='initrd.',
progress=lambda f:progress(0.5+f*0.5))
except:
-os.unlink(kfn)
+if kfn:
+
commit vm-install for openSUSE:11.3
Hello community,
here is the log from the commit of package vm-install for openSUSE:11.3
checked in at Tue Jul 26 17:04:05 CEST 2011.
--- old-versions/11.3/UPDATES/all/vm-install/vm-install.changes 2011-04-29
23:20:14.0 +0200
+++ 11.3/vm-install/vm-install.changes 2011-07-25 18:56:48.0 +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.3-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.IPlCj8/_old 2011-07-26 17:03:42.0 +0200
+++ /var/tmp/diff_new_pack.IPlCj8/_new 2011-07-26 17:03:42.0 +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:49:24.0 +0200
+++ new/vm-install-0.4.31/Makefile 2011-05-10 14:50:28.0 +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:49:17.0 +0200
+++ new/vm-install-0.4.31/setup.py 2011-05-10 14:50:15.0 +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:40:42.0
+0100
+++ new/vm-install-0.4.31/src/vmdisks/disks.py 2011-05-10 14:56:11.0
+0200
@@ -1025,16 +1025,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.py2011-03-04
16:39:15.0 +0100
+++ new/vm-install-0.4.31/src/vminstall/kvm_guest.py2011-05-10
14:53:34.0 +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
