Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2016-05-25 21:28:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-05-17 17:16:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes 2016-05-25 21:28:56.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 13 16:22:50 MDT 2016 - [email protected] + +- fate#319328 - Add virsh console conf to KVM Guests +- Version 0.8.53 + +------------------------------------------------------------------- Old: ---- vm-install-0.8.52.tar.bz2 New: ---- vm-install-0.8.53.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.Sp7nzo/_old 2016-05-25 21:28:57.000000000 +0200 +++ /var/tmp/diff_new_pack.Sp7nzo/_new 2016-05-25 21:28:57.000000000 +0200 @@ -27,12 +27,12 @@ %endif # For directory ownership: BuildRequires: yast2 -Version: 0.8.52 +Version: 0.8.53 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.52.tar.bz2 +Source0: %{name}-0.8.53.tar.bz2 Source1: vm-install.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: dbus-1-python ++++++ vm-install-0.8.52.tar.bz2 -> vm-install-0.8.53.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.52/Makefile new/vm-install-0.8.53/Makefile --- old/vm-install-0.8.52/Makefile 2016-05-09 16:04:08.000000000 +0200 +++ new/vm-install-0.8.53/Makefile 2016-05-14 00:43:51.000000000 +0200 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.8.52 +VER = 0.8.53 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.52/setup.py new/vm-install-0.8.53/setup.py --- old/vm-install-0.8.52/setup.py 2016-05-09 16:04:14.000000000 +0200 +++ new/vm-install-0.8.53/setup.py 2016-05-14 00:43:45.000000000 +0200 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.8.52', + version='0.8.53', description='Define a virtual machine and install its operating system', author='Charles Coffing', author_email='[email protected]', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.52/src/vminstall/ParaVirtGuest.py new/vm-install-0.8.53/src/vminstall/ParaVirtGuest.py --- old/vm-install-0.8.52/src/vminstall/ParaVirtGuest.py 2016-04-21 00:02:24.000000000 +0200 +++ new/vm-install-0.8.53/src/vminstall/ParaVirtGuest.py 2016-05-14 00:44:32.000000000 +0200 @@ -34,6 +34,10 @@ while True: ldev = '/dev/loop%i' % (i) if not os.path.exists(ldev): + if i == 0: + os.system("losetup -f > /dev/null 2>&1") + if os.path.exists(ldev): + continue break i += 1 fd = os.popen("losetup %s '%s' 2> /dev/null" % (ldev, vdev)) @@ -61,6 +65,10 @@ while True: ndev = '/dev/nbd%i' % (i) if not os.path.exists(ndev): + if i == 0: + os.system("modprobe nbd > /dev/null 2>&1") + if os.path.exists(pdev): + continue break i += 1 fd = os.popen("qemu-nbd -c %s '%s' 2> /dev/null" % (ndev, pdev)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.52/src/vminstall/full_virt_kvm_guest.py new/vm-install-0.8.53/src/vminstall/full_virt_kvm_guest.py --- old/vm-install-0.8.52/src/vminstall/full_virt_kvm_guest.py 2016-04-21 00:02:24.000000000 +0200 +++ new/vm-install-0.8.53/src/vminstall/full_virt_kvm_guest.py 2016-05-14 00:44:23.000000000 +0200 @@ -69,6 +69,7 @@ [ '<emulator>%s</emulator>' % self._qemu ], self._get_disk_xml(), self._get_network_xml(), + self._get_serial_xml(), self._get_host_devices_xml(), self._get_input_xml(), self._get_graphics_xml(), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.52/src/vminstall/full_virt_xen_guest.py new/vm-install-0.8.53/src/vminstall/full_virt_xen_guest.py --- old/vm-install-0.8.52/src/vminstall/full_virt_xen_guest.py 2016-04-21 00:02:24.000000000 +0200 +++ new/vm-install-0.8.53/src/vminstall/full_virt_xen_guest.py 2016-05-17 22:04:44.000000000 +0200 @@ -133,6 +133,7 @@ [ '<emulator>%s</emulator>' % self._qemu ], self._get_disk_xml(), self._get_network_xml(), + self._get_serial_xml(), self._get_host_devices_xml(), self._get_graphics_xml(), self._get_sound_xml(), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.52/src/vminstall/kvm_guest.py new/vm-install-0.8.53/src/vminstall/kvm_guest.py --- old/vm-install-0.8.52/src/vminstall/kvm_guest.py 2016-04-21 00:02:24.000000000 +0200 +++ new/vm-install-0.8.53/src/vminstall/kvm_guest.py 2016-05-14 00:44:09.000000000 +0200 @@ -155,6 +155,20 @@ nics.append(nic) return nics + def _get_serial_xml(self): + """Get the serial config in the libvirt XML format""" + serial = [] + if self.options.graphics == 'none': + serial.append("<serial type='pty'>") + target = ["<target port='0'/>"] + serial.append(target) + serial.append("</serial>") + serial.append("<console type='pty'>") + target = ["<target type='serial' port='0'/>"] + serial.append(target) + serial.append("</console>") + return serial + def _get_host_devices_xml(self): """Get the host device config in the libvirt XML format""" ##### Example PCI diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.52/src/vminstall/xen_guest.py new/vm-install-0.8.53/src/vminstall/xen_guest.py --- old/vm-install-0.8.52/src/vminstall/xen_guest.py 2016-04-21 00:02:24.000000000 +0200 +++ new/vm-install-0.8.53/src/vminstall/xen_guest.py 2016-05-17 22:04:38.000000000 +0200 @@ -213,6 +213,20 @@ ret += ']' return ret + def _get_serial_xml(self): + """Get the serial config in the libvirt XML format""" + serial = [] + if self.options.graphics == 'none': + serial.append("<serial type='pty'>") + target = ["<target port='0'/>"] + serial.append(target) + serial.append("</serial>") + serial.append("<console type='pty'>") + target = ["<target type='serial' port='0'/>"] + serial.append(target) + serial.append("</console>") + return serial + def _get_host_devices_xen(self): """Get the host device config in the xend python format""" # Example: pci=[ '0000:00:1c.4,managed=1' ]
