Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at Mon Jan 17 19:15:33 CET 2011. -------- --- vm-install/vm-install.changes 2010-12-11 00:39:51.000000000 +0100 +++ vm-install/vm-install.changes 2011-01-17 17:24:30.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Jan 11 11:41:27 MST 2011 - carnold@novell.com + +- bnc#657349 - Info file for linuxrc is not picked up by Xen +- Removed the extid flag. The viridian flag is used instead. + +------------------------------------------------------------------- +Wed Dec 29 17:24:50 MST 2010 - carnold@novell.com + +- bnc#661829 - vm-install ignores inst source, description and + other in vm-settings xml file + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- vm-install-0.4.27.tar.bz2 New: ---- vm-install-0.4.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.06DhZ7/_old 2011-01-17 19:12:23.000000000 +0100 +++ /var/tmp/diff_new_pack.06DhZ7/_new 2011-01-17 19:12:23.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package vm-install (Version 0.4.27) +# spec file for package vm-install # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,10 +26,10 @@ License: GPLv2+ Group: System/Emulators/PC AutoReqProv: yes -Version: 0.4.27 -Release: 3 +Version: 0.4.28 +Release: 1 Summary: Tool to Define a Virtual Machine and Install Its Operating System -Source0: %{name}-0.4.27.tar.bz2 +Source0: %{name}-0.4.28.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.27.tar.bz2 -> vm-install-0.4.28.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.27/Makefile new/vm-install-0.4.28/Makefile --- old/vm-install-0.4.27/Makefile 2010-10-26 22:33:24.000000000 +0200 +++ new/vm-install-0.4.28/Makefile 2011-01-03 21:16:35.000000000 +0100 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.4.27 +VER = 0.4.28 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.27/setup.py new/vm-install-0.4.28/setup.py --- old/vm-install-0.4.27/setup.py 2010-10-26 22:33:53.000000000 +0200 +++ new/vm-install-0.4.28/setup.py 2011-01-03 21:16:31.000000000 +0100 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.4.27', + version='0.4.28', description='Define a virtual machine and install its operating system', author='Charles Coffing', author_email='ccoffing@novell.com', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.27/src/vminstall/VMSUSE.py new/vm-install-0.4.28/src/vminstall/VMSUSE.py --- old/vm-install-0.4.27/src/vminstall/VMSUSE.py 2010-08-11 19:04:42.000000000 +0200 +++ new/vm-install-0.4.28/src/vminstall/VMSUSE.py 2011-01-11 19:39:03.000000000 +0100 @@ -327,7 +327,18 @@ ay_vdev = autoyast_vdev if options.os_type != 'sles11': ay_vdev = 'xvdp' - args += ' autoyast=device://%s/autoinst.xml' % (ay_vdev,) + # If a directory, look for either 'info' or 'autoinst.xml' + if os.path.isdir(ay): + if os.path.isfile(ay + "/info"): + args += ' info=disk:/info' + if os.path.isfile(ay + "/autoinst.xml"): + args += ' autoyast=device://%s/autoinst.xml' % (ay_vdev,) + else: + # File specified, look for either 'info' or anything else + if ay.endswith("info"): + args += ' info=disk:/info' + else: + args += ' autoyast=device://%s/%s' % (ay_vdev,os.path.basename(ay)) return args def preprocessOptions(self, options): @@ -379,10 +390,15 @@ try: mode = os.stat(ay).st_mode if stat.S_ISREG(mode): - shutil.copyfile(ay, mountpoint + '/autoinst.xml') + if ay.endswith("info"): + shutil.copyfile(ay, mountpoint + '/info') + else: + shutil.copyfile(ay, mountpoint + "/" + os.path.basename(ay)) elif stat.S_ISDIR(mode): - shutil.copyfile(ay + '/autoinst.xml', mountpoint + '/autoinst.xml') - shutil.copyfile(ay + '/info', mountpoint + '/info') + if os.path.isfile(ay + "/autoinst.xml"): + shutil.copyfile(ay + '/autoinst.xml', mountpoint + '/autoinst.xml') + if os.path.isfile(ay + "/info"): + shutil.copyfile(ay + '/info', mountpoint + '/info') finally: progress(0.9) mounted_disk.unmount() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.27/src/vminstall/advanced.py new/vm-install-0.4.28/src/vminstall/advanced.py --- old/vm-install-0.4.27/src/vminstall/advanced.py 2010-11-10 00:29:53.000000000 +0100 +++ new/vm-install-0.4.28/src/vminstall/advanced.py 2011-01-11 19:40:32.000000000 +0100 @@ -21,7 +21,6 @@ 'acpi': ['1', "Enable Advanced Configuration and Power Interface."], 'apic': ['1', "Enable Advanced Programmable Interrupt Controller."], 'blkif': ['0', "Make the domain a block device backend."], - 'extid': ['1', "Enable extention ID for windows HVM domains."], 'hap': ['1', "Enable Hardware Assisted Paging"], 'hpet': ['0', "Enable virtual High-Precision Event Timer."], 'isa': ['0', "Simulate an Industry Standard Architecture only system"], @@ -111,8 +110,6 @@ current_state = defaults.apic if (defaults.apic is not None) else int(adv_args[arg][0]) elif arg == 'blkif': current_state = defaults.blkif if (defaults.blkif is not None) else int(adv_args[arg][0]) - elif arg == 'extid': - current_state = defaults.extid if (defaults.extid is not None) else int(adv_args[arg][0]) elif arg == 'hap': current_state = defaults.hap if (defaults.hap is not None) else int(adv_args[arg][0]) elif arg == 'hpet': @@ -173,8 +170,6 @@ options.apic = state elif arg == 'blkif': options.blkif = state - elif arg == 'extid': - options.extid = state elif arg == 'hap': options.hap = state elif arg == 'hpet': @@ -271,18 +266,6 @@ elif arg == 'blkif' and options.blkif is not None and \ int(options.blkif) != int(adv_args[arg][0]): value += 'blkif=%d\n' % int(options.blkif) - elif arg == 'extid': - virt_support = VMDefaults[options.os_type].virt_support() - if virt_support[0] == 'hvm-ext': - if options.extid is None: - value += 'extid=1\n' - else: - value += 'extid=%d\n' % int(options.extid) - elif options.extid is not None and \ - int(options.extid) != int(adv_args[arg][0]): - value += 'extid=%d\n' % int(options.extid) - else: - value += 'extid=0\n' elif arg == 'hap' and options.hap is not None and \ int(options.hap) != int(adv_args[arg][0]): value += 'hap=%d\n' % int(options.hap) @@ -340,9 +323,18 @@ elif arg == 'usb' and options.usb is not None and \ int(options.usb) != int(adv_args[arg][0]): value += 'usb=%d\n' % int(options.usb) - elif arg == 'viridian' and options.viridian is not None and \ - int(options.viridian) != int(adv_args[arg][0]): - value += 'viridian=%d\n' % int(options.viridian) + elif arg == 'viridian': + virt_support = VMDefaults[options.os_type].virt_support() + if virt_support[0] == 'hvm-ext': + if options.viridian is None: + value += 'viridian=1\n' + else: + value += 'viridian=%d\n' % int(options.viridian) + elif options.viridian is not None and \ + int(options.viridian) != int(adv_args[arg][0]): + value += 'viridian=%d\n' % int(options.viridian) + else: + value += 'viridian=0\n' elif arg == 'vnc' and options.vnc is not None and \ int(options.vnc) != int(adv_args[arg][0]): value += 'vnc=%d\n' % int(options.vnc) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.27/src/vminstall/gtk/interface.py new/vm-install-0.4.28/src/vminstall/gtk/interface.py --- old/vm-install-0.4.27/src/vminstall/gtk/interface.py 2010-08-02 18:50:15.000000000 +0200 +++ new/vm-install-0.4.28/src/vminstall/gtk/interface.py 2010-12-30 20:14:26.000000000 +0100 @@ -745,6 +745,8 @@ # Page: Name of the Virtual Machine # elif page_number == self.pages['name']: + if self.defaults.description: + self.window.get_widget('description-entry').set_text(self.defaults.description) w = self.window.get_widget('create-vm-name') w.connect('activate', self.apply) w.set_text(strify(self.defaults.name)) @@ -924,6 +926,7 @@ if src: if src not in inst_sources: combo.insert_text(0, src) + combo.set_active(0) else: index = inst_sources.index(src) combo.set_active(inst_sources.index(src)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.27/src/vminstall/options.py new/vm-install-0.4.28/src/vminstall/options.py --- old/vm-install-0.4.27/src/vminstall/options.py 2010-11-10 00:31:06.000000000 +0100 +++ new/vm-install-0.4.28/src/vminstall/options.py 2011-01-11 19:40:07.000000000 +0100 @@ -97,7 +97,7 @@ for disk in value: if self.virtio is not None: disk.virtio = self.virtio - else: + elif self.os_type is not None: disk.virtio = VMDefaults[self.os_type].virtio() dst.disks.append(disk.copy()) elif key == 'nics' and value is not None: @@ -264,7 +264,7 @@ if not isinstance(value, libvirt_hypervisor.LibVirtHypervisor) and \ not isinstance(value, xen_hypervisor.Xend): bad() - elif item == 'acpi' or item == 'extid' or item == 'blkif' or \ + elif item == 'acpi' or item == 'blkif' or \ item == 'hap' or item == 'hpet' or item == 'isa' or \ item == 'localtime' or item == 'memory_sharing' or \ item == 'monitor' or item == 'netif' or item == 'nomigrate' or \ @@ -716,7 +716,6 @@ # Advanced options Xen specific if caps.is_xen(): defaults.blkif = options.blkif - defaults.extid = options.extid defaults.hap = options.hap defaults.isa = options.isa defaults.localtime = options.localtime diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.27/src/vminstall/xen_guest.py new/vm-install-0.4.28/src/vminstall/xen_guest.py --- old/vm-install-0.4.27/src/vminstall/xen_guest.py 2010-07-21 22:48:02.000000000 +0200 +++ new/vm-install-0.4.28/src/vminstall/xen_guest.py 2010-12-30 19:02:46.000000000 +0100 @@ -32,7 +32,7 @@ return 'description="%s"\n' % self.options.description def _get_description_xml(self): - return ['<description>"%s"</description>' % self.options.description] + return ['<description>%s</description>' % self.options.description] def _get_memory_xml(self): # XML wants KB diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.27/src/vminstall/xml.py new/vm-install-0.4.28/src/vminstall/xml.py --- old/vm-install-0.4.27/src/vminstall/xml.py 2010-08-11 19:04:59.000000000 +0200 +++ new/vm-install-0.4.28/src/vminstall/xml.py 2011-01-03 23:24:08.000000000 +0100 @@ -97,8 +97,9 @@ ctxt = doc.xpathNewContext() dom = reqElem(ctxt, "/domain[@type='xen' or @type='kvm']") set(options, 'name', tryStr(dom, 'name')) - set(options, 'memoryMB', K2M(tryInt(dom, 'memory'))) - set(options, 'max_memoryMB', K2M(tryInt(dom, 'maxmemory'))) + set(options, 'description', tryStr(dom, 'description')) + set(options, 'memoryMB', K2M(tryInt(dom, 'currentMemory'))) + set(options, 'max_memoryMB', K2M(tryInt(dom, 'memory'))) set(options, 'vcpus', tryInt(dom, 'vcpu')) set(options, 'uuid', tryStr(dom, 'uuid')) set(options, 'on_crash', tryStr(dom, 'on_crash')) @@ -108,6 +109,26 @@ # clock = tryElem(dom, 'clock') os = tryElem(dom, 'os') if os: + os_source = None + os_data = str(os) + os_data = os_data.split(" ") + for data in os_data: + if data.startswith("type="): + data = data.split('"') + if len(data) > 1: + set(options, 'os_type', data[1]) + elif data.startswith("source="): + data = data.split('"') + if len(data) > 1: + os_source = data[1] + set(options, 'source', os_source) + elif data.startswith("install=") or data.startswith("<cmdline>install="): + if os_source is None: + data = data.split('=') + if len(data) > 1: + os_install = data[1].split("</cmdline>") + os_source = os_install[0] + set(options, 'source', os_source) full_virt = tryStr(os, 'type') if full_virt is not None: set(options, 'full_virt', full_virt == 'hvm') ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org