Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2014-04-13 13:21:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-03-30 12:29:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes 2014-04-13 13:21:52.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Apr 4 15:37:25 MDT 2014 - carn...@suse.com + +- Fix XML output format for Direct Kernel Boot of Xen HVM guests + +------------------------------------------------------------------- +Tue Apr 3 07:55:32 MDT 2014 - carn...@suse.com + +- s390x: kernel name has changed for SLE12. Lookup correct name. +- Version 0.8.14 + +------------------------------------------------------------------- +Tue Apr 1 14:15:32 MDT 2014 - carn...@suse.com + +- Fix unsupported protocol error +- Version 0.8.13 + +------------------------------------------------------------------- @@ -3,0 +21 @@ +- Enable support for ppc64le Old: ---- vm-install-0.8.12.tar.bz2 New: ---- vm-install-0.8.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.7GvAgN/_old 2014-04-13 13:21:52.000000000 +0200 +++ /var/tmp/diff_new_pack.7GvAgN/_new 2014-04-13 13:21:52.000000000 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: vm-install %if %suse_version <= 1230 %define with_vminstall_as_default_installer 1 @@ -26,12 +27,12 @@ %endif # For directory ownership: BuildRequires: yast2 -Version: 0.8.12 +Version: 0.8.14 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.12.tar.bz2 +Source0: %{name}-0.8.14.tar.bz2 Source1: vm-install.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 s390x ++++++ vm-install-0.8.12.tar.bz2 -> vm-install-0.8.14.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.12/Makefile new/vm-install-0.8.14/Makefile --- old/vm-install-0.8.12/Makefile 2014-03-28 17:41:53.000000000 +0100 +++ new/vm-install-0.8.14/Makefile 2014-04-03 15:59:29.000000000 +0200 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.8.12 +VER = 0.8.14 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.12/setup.py new/vm-install-0.8.14/setup.py --- old/vm-install-0.8.12/setup.py 2014-03-28 17:41:48.000000000 +0100 +++ new/vm-install-0.8.14/setup.py 2014-04-03 15:59:25.000000000 +0200 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.8.12', + version='0.8.14', 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.12/src/vminstall/VMSUSE.py new/vm-install-0.8.14/src/vminstall/VMSUSE.py --- old/vm-install-0.8.12/src/vminstall/VMSUSE.py 2014-01-06 19:57:02.000000000 +0100 +++ new/vm-install-0.8.14/src/vminstall/VMSUSE.py 2014-04-08 00:13:51.000000000 +0200 @@ -168,7 +168,10 @@ for mediaroot in self._getMediaRoots(root): for a in arches: if a[0] == 's390x': - kfn = '/%s/boot/%s/vmrdr.ikr' % (mediaroot, a[0]) + if options.os_type == "sles11" or options.os_type == "sled11": + kfn = '/%s/boot/%s/vmrdr.ikr' % (mediaroot, a[0]) + else: + kfn = '/%s/boot/%s/linux' % (mediaroot, a[0]) ifn = '/%s/boot/%s/initrd' % (mediaroot, a[0]) elif options.direct_kernel_boot: if a[0] is not '': @@ -262,7 +265,10 @@ for a in arches: try: if a[0] == 's390x': - kfn = '/%s/boot/%s/vmrdr.ikr' % (mediaroot, a[0]) + if options.os_type == "sles11" or options.os_type == "sled11": + kfn = '/%s/boot/%s/vmrdr.ikr' % (mediaroot, a[0]) + else: + kfn = '/%s/boot/%s/linux' % (mediaroot, a[0]) ifn = '/%s/boot/%s/initrd' % (mediaroot, a[0]) elif options.direct_kernel_boot: kfn = '/%s/boot/%s/loader/linux' % (mediaroot, a[0]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.12/src/vminstall/full_virt_xen_guest.py new/vm-install-0.8.14/src/vminstall/full_virt_xen_guest.py --- old/vm-install-0.8.12/src/vminstall/full_virt_xen_guest.py 2013-07-17 04:00:39.000000000 +0200 +++ new/vm-install-0.8.14/src/vminstall/full_virt_xen_guest.py 2014-04-08 00:14:16.000000000 +0200 @@ -78,10 +78,19 @@ if self.isInstall and self.options.direct_kernel_boot and self.dkb: os.append("<kernel>%s</kernel>" % self.dkb.kernel) os.append("<initrd>%s</initrd>" % self.dkb.initrd) - os.append("<cmdline>%s %s</cmdline>" % (self.options.os_settings, self.options.extra_args)) + extra = '%s %s' % (self.options.os_settings, self.options.extra_args) + if type(self.options.source) is str: + if self.options.source.startswith("ftp://";) or \ + self.options.source.startswith("http://";) or \ + self.options.source.startswith("tftp://";) or \ + self.options.source.startswith("nfs://"): + bootdev = None + extra = '%s %s' % (self.options._install_args, self.options.extra_args) + os.append("<cmdline>%s</cmdline>" % extra) else: os.append("<loader>%s</loader>" % self.options.loader) - os.append("<boot dev='%s'/>" % bootdev ) + if bootdev: + os.append("<boot dev='%s'/>" % bootdev ) return os def _get_features_xml(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.12/src/vminstall/options.py new/vm-install-0.8.14/src/vminstall/options.py --- old/vm-install-0.8.12/src/vminstall/options.py 2014-03-28 17:37:04.000000000 +0100 +++ new/vm-install-0.8.14/src/vminstall/options.py 2014-04-03 15:35:55.000000000 +0200 @@ -716,10 +716,7 @@ break if not supported: # If we switch os types and source is incompatable with new type, just clear it - if old_os_type != defaults.os_type: - options.source = defaults.source = None - else: - raise InstSrcError(err=InstSrcError.E_UNSUPPORTED, details=','.join(protocols)) + options.source = defaults.source = None if type(defaults.source) is str and defaults.source.startswith('dev:/'): # User specified string; convert to disk. vdev = defaults.source[5:] @@ -743,7 +740,10 @@ elif caps.is_kvm(): dom0_inst_source = util.getDom0InstallSource() if dom0_inst_source: - if dom0_inst_source.startswith('ftp:') or dom0_inst_source.startswith('http:') or dom0_inst_source.startswith('smb:') or dom0_inst_source.startswith('nfs:'): + if dom0_inst_source.startswith('ftp:') or \ + dom0_inst_source.startswith('http:') or \ + dom0_inst_source.startswith('smb:') or \ + dom0_inst_source.startswith('nfs:'): options.source = defaults.source = dom0_inst_source elif 'dev:/' in vmdefaults.install_sources()[1]: vdevs = filter(lambda d: d.exists(), defaults.disks) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
