Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2012-10-12 14:48:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vm-install (Old) and /work/SRC/openSUSE:Factory/.vm-install.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vm-install", Maintainer is "carn...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2012-09-14 12:41:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes 2012-10-12 14:54:48.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Oct 04 13:24:07 MDT 2012 - carn...@novell.com + +- KVM: Modify the defaults for installing NetWare on KVM +- KVM: Fix bug not allowing vesa graphics selection for guest + +------------------------------------------------------------------- +Tue Sep 11 15:24:07 MDT 2012 - carn...@novell.com + +- bnc#779494 - SM wont install on KVM/Virt-Manager + +------------------------------------------------------------------- +Mon Sep 10 10:58:05 MDT 2012 - carn...@novell.com + +- bnc#779280 - vm-install doesn't honour / correctly document disk + options via --disk +- Version 0.6.10 + +------------------------------------------------------------------- Old: ---- vm-install-0.6.9.tar.bz2 New: ---- vm-install-0.6.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.TqFaSI/_old 2012-10-12 14:54:50.000000000 +0200 +++ /var/tmp/diff_new_pack.TqFaSI/_new 2012-10-12 14:54:50.000000000 +0200 @@ -15,19 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: vm-install Url: http://developer.novell.com/wiki/index.php/Vm-install BuildRequires: python-devel BuildRequires: update-desktop-files # For directory ownership: BuildRequires: yast2 -Version: 0.6.9 +Version: 0.6.11 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.6.9.tar.bz2 +Source0: %{name}-0.6.11.tar.bz2 Source1: vm-install.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ++++++ vm-install-0.6.9.tar.bz2 -> vm-install-0.6.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/Makefile new/vm-install-0.6.11/Makefile --- old/vm-install-0.6.9/Makefile 2012-08-21 16:32:13.000000000 +0200 +++ new/vm-install-0.6.11/Makefile 2012-10-04 21:27:31.000000000 +0200 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.6.9 +VER = 0.6.11 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/bin/vm-disks new/vm-install-0.6.11/bin/vm-disks --- old/vm-install-0.6.9/bin/vm-disks 2011-03-16 00:30:09.000000000 +0100 +++ new/vm-install-0.6.11/bin/vm-disks 2012-10-04 23:57:19.000000000 +0200 @@ -11,7 +11,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA from optparse import OptionParser import os diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/bin/vm-install new/vm-install-0.6.11/bin/vm-install --- old/vm-install-0.6.9/bin/vm-install 2012-08-11 00:00:22.000000000 +0200 +++ new/vm-install-0.6.11/bin/vm-install 2012-10-04 23:57:09.000000000 +0200 @@ -10,7 +10,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import optparse import os @@ -62,23 +62,11 @@ def setHostDevice(option, opt_str, value, parser): parser.values.passthrough = True - #hd = vminstall.passthrough.parse_string(value) - #if parser.values.host_devices: - # parser.values.host_devices.extend(hd) - #else: - # parser.values.host_devices = hd - if len(parser.rargs): - for val in parser.rargs: - if val.startswith("-"): - break - value = val if (value is None) else value + val - if not value: - return - hd = vminstall.passthrough.parse_string(value) - if parser.values.host_devices: - parser.values.host_devices.extend(hd) - else: - parser.values.host_devices = hd + hd = vminstall.passthrough.parse_string(value) + if parser.values.host_devices: + parser.values.host_devices.extend(hd) + else: + parser.values.host_devices = hd def setCPUID(option, opt_str, value, parser): cpuid = vminstall.cpuid.parse_string(value) @@ -141,7 +129,7 @@ help="set cpuid consistency checks before allowing the host to run a fully " \ "virtualized VM: CPUID:[REG=],[REG=],...") parser.add_option('-d', '--disk', type='string', action='callback', callback=setDisk, - help="defines a virtual disk: PDEV,VDEV[,TYPE[,MODE[,MB]]]") + help="defines a virtual disk: PDEV,VDEV[,TYPE[,MODE[,MB[,OPTIONS]]]]") parser.add_option('-g', '--graphics', type='string', help="graphics hardware; one of 'cirrus', 'none', 'para', 'vesa'") parser.add_option('', '--graphics-viewer', type='string', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/bin/vm-install-jobs new/vm-install-0.6.11/bin/vm-install-jobs --- old/vm-install-0.6.9/bin/vm-install-jobs 2011-03-16 00:30:09.000000000 +0100 +++ new/vm-install-0.6.11/bin/vm-install-jobs 2012-10-04 23:57:27.000000000 +0200 @@ -10,7 +10,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import optparse import sys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/man/vm-install.8 new/vm-install-0.6.11/man/vm-install.8 --- old/vm-install-0.6.9/man/vm-install.8 2012-08-08 18:29:30.000000000 +0200 +++ new/vm-install-0.6.11/man/vm-install.8 2012-09-11 00:46:59.000000000 +0200 @@ -91,7 +91,7 @@ .TP .B -d\fR \fIDISK\fR, \fB--disk\fR \fIDISK\fP Defines an additional virtual disk. Repeat for multiple disks. \fIDISK\fR is -of the form \fIPDEV\fR,\fIVDEV\fR[,\fITYPE\fR[,\fIMODE\fR[,\fIMB\fR[,\fIOPTIONS\fR...]]]. +of the form \fIPDEV\fR,\fIVDEV\fR[,\fITYPE\fR[,\fIMODE\fR[,\fIMB\fR[,\fIOPTIONS\fR...]]]]. \fIPDEV\fR describes the physical storage. In its simplest form, \fIPDEV\fR can be a path to a file or block device. More complex forms require prefixing @@ -119,8 +119,10 @@ if \fIPDEV\fR does not already exist). Currently, only \fBfile\fR, \fBtap:aio\fR, and \fBtap:qcow\fR can be created from scratch. -\fIOPTIONS\fR are any number of protocol-specific options. For example, -\fBfile\fR might be passed the \fBsparse=0\fR option. +\fIOPTIONS\fR are a few protocol-specific options. For example, +\fBfile\fR might be passed the \fBsparse=0\fR option. Valid options are: +For Xen and KVM: sparse=[1|0] +For KVM only: cachemode=[default|directsync|none|unsafe|writeback|writethrough] .TP .B --graphics @@ -177,7 +179,7 @@ pci=[\fIDOMAIN\fR:\fIBUS\fR:\fISLOT\fR.\fIFUNC\fR[:\fIMANAGED\fR]] or usb=[\fIBUS\fR:\fIDEVICE\fR:\fIVENDOR_ID\fR:\fIPRODUCT_ID\fR[:\fIMANAGED\fR]]. \fIMANAGED\fR is optional and is set to have libvirt manage the device. -This managed flag is currently only supported for KVM guests. +The managed flag is currently only supported for KVM guests. .TP .B -u\fR \fIUUID\fR, \fB--uuid\fR \fIUUID\fR UUID for the VM. If none is given, a random UUID will be generated. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/setup.py new/vm-install-0.6.11/setup.py --- old/vm-install-0.6.9/setup.py 2012-08-21 16:32:09.000000000 +0200 +++ new/vm-install-0.6.11/setup.py 2012-10-04 21:27:31.000000000 +0200 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.6.9', + version='0.6.11', 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.6.9/src/vmdisks/disks.py new/vm-install-0.6.11/src/vmdisks/disks.py --- old/vm-install-0.6.9/src/vmdisks/disks.py 2012-06-28 00:57:35.000000000 +0200 +++ new/vm-install-0.6.11/src/vmdisks/disks.py 2012-10-04 23:55:38.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA # # Here's the inheritance tree for disk objects # @@ -419,7 +419,7 @@ words[-1] += c escaped = False return words - params = escaped_split(disk, ',', 5) + params = escaped_split(disk, ',', 7) if extended: if len(params) < 6: bad() @@ -465,7 +465,10 @@ virtio=True except: continue - else: + elif arg is '': + # Empty string assumes default + continue + elif arg.startswith('sparse='): kv = arg.split('=', 1) if len(kv) > 1: try: @@ -474,6 +477,8 @@ continue args[kv[0]] = kv[1] continue + else: + raise ParamError(err=ParamError.E_INVALID, details=arg) disk = Disk(pdev=pdev, vdev=vdev, vdevType=vdevType, ro=ro, blocks=blocks, virtio=virtio) if extended: disk.description = params[5] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/ParaVirtGuest.py new/vm-install-0.6.11/src/vminstall/ParaVirtGuest.py --- old/vm-install-0.6.9/src/vminstall/ParaVirtGuest.py 2012-08-08 23:31:51.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/ParaVirtGuest.py 2012-10-04 23:47:00.000000000 +0200 @@ -9,7 +9,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import os import re diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/VMActions.py new/vm-install-0.6.11/src/vminstall/VMActions.py --- old/vm-install-0.6.9/src/vminstall/VMActions.py 2011-12-05 22:42:24.000000000 +0100 +++ new/vm-install-0.6.11/src/vminstall/VMActions.py 2012-10-04 23:51:53.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA from exceptions import * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/VMDefaults.py new/vm-install-0.6.11/src/vminstall/VMDefaults.py --- old/vm-install-0.6.9/src/vminstall/VMDefaults.py 2012-09-04 23:15:43.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/VMDefaults.py 2012-10-04 23:45:42.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA from nics import XenNic from nics import KvmNic @@ -529,7 +529,15 @@ def auto_install(self): return msg.nwresponse_desc def num_vcpus(self): - return caps.vcpu_processors(2) + if caps.is_kvm() or caps.is_qemu(): + return 1 + else: + return caps.vcpu_processors(2) + def nics(self): + if caps.is_kvm() or caps.is_qemu(): + return [ KvmNic(model='e1000') ] + else: + return [ XenNic() ] class NOES2NWDefaults(NetWareDefaults): def name(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/VMLinux.py new/vm-install-0.6.11/src/vminstall/VMLinux.py --- old/vm-install-0.6.9/src/vminstall/VMLinux.py 2012-04-20 22:01:07.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/VMLinux.py 2012-10-04 23:48:49.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import os import glob diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/VMNetWare.py new/vm-install-0.6.11/src/vminstall/VMNetWare.py --- old/vm-install-0.6.9/src/vminstall/VMNetWare.py 2011-12-08 19:01:53.000000000 +0100 +++ new/vm-install-0.6.11/src/vminstall/VMNetWare.py 2012-10-04 23:49:06.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import os import re diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/VMPXE.py new/vm-install-0.6.11/src/vminstall/VMPXE.py --- old/vm-install-0.6.9/src/vminstall/VMPXE.py 2012-02-28 23:42:28.000000000 +0100 +++ new/vm-install-0.6.11/src/vminstall/VMPXE.py 2012-10-04 23:48:26.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA from cStringIO import StringIO import glob diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/VMReaR.py new/vm-install-0.6.11/src/vminstall/VMReaR.py --- old/vm-install-0.6.9/src/vminstall/VMReaR.py 2012-06-13 16:36:07.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/VMReaR.py 2012-10-04 23:48:34.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import urlgrabber.grabber as grabber diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/VMRedHat.py new/vm-install-0.6.11/src/vminstall/VMRedHat.py --- old/vm-install-0.6.9/src/vminstall/VMRedHat.py 2011-08-23 21:25:42.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/VMRedHat.py 2012-10-04 23:48:41.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import urlgrabber.grabber as grabber diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/VMSUSE.py new/vm-install-0.6.11/src/vminstall/VMSUSE.py --- old/vm-install-0.6.9/src/vminstall/VMSUSE.py 2012-02-16 01:12:33.000000000 +0100 +++ new/vm-install-0.6.11/src/vminstall/VMSUSE.py 2012-10-04 23:48:20.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA from cStringIO import StringIO import glob @@ -168,10 +168,15 @@ for mediaroot in self._getMediaRoots(root): for a in arches: if options.direct_kernel_boot: - k = '/boot/%s/loader/linux' % a[0] + if a[0] is not '': + k = '/boot/%s/loader/linux' % a[0] + kfn = '%s/%s%s' % (root, mediaroot, k) + ifn = '%s/%s/boot/%s/loader/initrd' % (root, mediaroot, a[0]) + else: + k = '/boot' + kfn = '%s/%s%s/linux' % (root, mediaroot, k) + ifn = '%s/%s%s/initrd' % (root, mediaroot, k) searched.append(k) - kfn = '%s/%s%s' % (root, mediaroot, k) - ifn = '%s/%s/boot/%s/loader/initrd' % (root, mediaroot, a[0]) else: k = '/boot/%s/vmlinuz-%s' % (a[0], a[1]) searched.append(k) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/VMUbuntu.py new/vm-install-0.6.11/src/vminstall/VMUbuntu.py --- old/vm-install-0.6.9/src/vminstall/VMUbuntu.py 2011-05-20 23:18:18.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/VMUbuntu.py 2012-10-04 23:54:22.000000000 +0200 @@ -7,7 +7,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import urlgrabber.grabber as grabber diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/VMWindows.py new/vm-install-0.6.11/src/vminstall/VMWindows.py --- old/vm-install-0.6.9/src/vminstall/VMWindows.py 2011-05-20 23:18:18.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/VMWindows.py 2012-10-04 23:44:29.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA from exceptions import * from VMActions import VMActions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/advanced.py new/vm-install-0.6.11/src/vminstall/advanced.py --- old/vm-install-0.6.9/src/vminstall/advanced.py 2011-06-13 22:19:16.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/advanced.py 2012-10-04 23:50:24.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import caps from VMDefaults import VMDefaults diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/caps.py new/vm-install-0.6.11/src/vminstall/caps.py --- old/vm-install-0.6.9/src/vminstall/caps.py 2012-09-04 23:09:17.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/caps.py 2012-10-04 23:48:08.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import os import platform @@ -87,7 +87,7 @@ def compatible_arches(supports_32nonpae=True): if is_kvm() or is_qemu(): if kvm_arch() == 'x86_64': - arches = [['i386', 'kvm'], ['i586', 'kvm'], ['x86_64', 'kvm']] + arches = [['i386', 'kvm'], ['i586', 'kvm'], ['x86_64', 'kvm'], ['', 'kvm']] else: arches = [['i386', 'kvm'], ['i586', 'kvm']] return arches diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/console.py new/vm-install-0.6.11/src/vminstall/console.py --- old/vm-install-0.6.9/src/vminstall/console.py 2011-05-20 23:18:18.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/console.py 2012-10-04 23:52:31.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import os import threading diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/cpuid.py new/vm-install-0.6.11/src/vminstall/cpuid.py --- old/vm-install-0.6.9/src/vminstall/cpuid.py 2011-05-20 23:18:18.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/cpuid.py 2012-10-04 23:53:01.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import os import re diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/direct_kernel_boot.py new/vm-install-0.6.11/src/vminstall/direct_kernel_boot.py --- old/vm-install-0.6.9/src/vminstall/direct_kernel_boot.py 2011-12-05 22:42:04.000000000 +0100 +++ new/vm-install-0.6.11/src/vminstall/direct_kernel_boot.py 2012-10-04 23:52:26.000000000 +0200 @@ -9,7 +9,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import os import re diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/exceptions.py new/vm-install-0.6.11/src/vminstall/exceptions.py --- old/vm-install-0.6.9/src/vminstall/exceptions.py 2012-08-07 23:44:16.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/exceptions.py 2012-10-04 23:47:50.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA # Do not change self.base or self.err numbering in a way that breaks diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/full_virt_guest.py new/vm-install-0.6.11/src/vminstall/full_virt_guest.py --- old/vm-install-0.6.9/src/vminstall/full_virt_guest.py 2011-05-20 23:18:18.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/full_virt_guest.py 2012-10-04 23:46:30.000000000 +0200 @@ -10,7 +10,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA ################################################################################ class FullVirtGuest: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/full_virt_kvm_guest.py new/vm-install-0.6.11/src/vminstall/full_virt_kvm_guest.py --- old/vm-install-0.6.9/src/vminstall/full_virt_kvm_guest.py 2012-08-08 00:02:08.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/full_virt_kvm_guest.py 2012-10-05 00:37:48.000000000 +0200 @@ -9,7 +9,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA from exceptions import * from full_virt_guest import FullVirtGuest @@ -68,6 +68,7 @@ self._get_input_xml(), self._get_graphics_xml(), self._get_sound_xml(), + self._get_misc_xml(), '</devices>' ], '</domain>\n' ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/full_virt_xen_guest.py new/vm-install-0.6.11/src/vminstall/full_virt_xen_guest.py --- old/vm-install-0.6.9/src/vminstall/full_virt_xen_guest.py 2012-08-08 00:02:08.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/full_virt_xen_guest.py 2012-10-04 23:46:45.000000000 +0200 @@ -9,7 +9,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA from exceptions import * from full_virt_guest import FullVirtGuest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/globals.py new/vm-install-0.6.11/src/vminstall/globals.py --- old/vm-install-0.6.9/src/vminstall/globals.py 2012-06-28 00:57:29.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/globals.py 2012-10-04 23:51:12.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import caps diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/graphics_adapter.py new/vm-install-0.6.11/src/vminstall/graphics_adapter.py --- old/vm-install-0.6.9/src/vminstall/graphics_adapter.py 2011-05-20 23:18:18.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/graphics_adapter.py 2012-10-04 23:53:26.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA # # Class and associated subclasses to deal with graphics adapters # for various hypervisors. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/gtk/gjob.py new/vm-install-0.6.11/src/vminstall/gtk/gjob.py --- old/vm-install-0.6.9/src/vminstall/gtk/gjob.py 2011-09-28 00:04:59.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/gtk/gjob.py 2012-10-04 23:55:11.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import gobject import threading diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/gtk/interface.py new/vm-install-0.6.11/src/vminstall/gtk/interface.py --- old/vm-install-0.6.9/src/vminstall/gtk/interface.py 2012-09-04 23:10:11.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/gtk/interface.py 2012-10-04 23:49:40.000000000 +0200 @@ -9,7 +9,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import gtk import gobject @@ -303,9 +303,6 @@ 'graphics_adapter', 'keymap', 'sound_card', 'operating_system', 'installation_source', 'automated_installation', 'extra_args'): widget = self.summary.get_widget('%s_prompt' % name) - if name == 'host_devices' and not self.options.passthrough: - widget.hide_all() - continue text = eval('vminstall.msg.%s_prompt' % name) widget.set_markup(bold_prompt(text)) @@ -782,11 +779,10 @@ else: self.summary.get_widget("summary-max-memory").set_text(str(self.defaults.max_memoryMB) + " MB") self.summary.get_widget("summary-virtual-cpus").set_text(str(int(self.defaults.vcpus))) - if self.options.passthrough: - if self.defaults.host_devices: - self.summary.get_widget("summary-host-devices").set_text(str(len(self.defaults.host_devices))) - else: - self.summary.get_widget("summary-host-devices").set_text(vminstall.msg.none) + if self.defaults.host_devices: + self.summary.get_widget("summary-host-devices").set_text(str(len(self.defaults.host_devices))) + else: + self.summary.get_widget("summary-host-devices").set_text(vminstall.msg.none) self.summary.get_widget("summary-graphics").set_text(self.graphics_str()) keymap = keytable.get_keymap(self.options.keymap) if keymap: @@ -1527,11 +1523,6 @@ self.window.get_widget('advanced-settings-button').hide_all() else: self.window.get_widget('advanced-settings-button').show_all() - if not self.options.passthrough: - self.window.get_widget('host_device_help').hide_all() - self.window.get_widget('hardware-host-devices').hide_all() - self.window.get_widget('manage-vm-devices-button').hide_all() - self.window.get_widget('host-devices-hbox-note').hide_all() def do_method(self, widget, event): self.notebook.set_current_page(self.pages['method']) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/guest.py new/vm-install-0.6.11/src/vminstall/guest.py --- old/vm-install-0.6.9/src/vminstall/guest.py 2011-05-20 23:18:18.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/guest.py 2012-10-04 23:53:15.000000000 +0200 @@ -9,7 +9,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA # # Hypervisor guest support. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/hypervisor.py new/vm-install-0.6.11/src/vminstall/hypervisor.py --- old/vm-install-0.6.9/src/vminstall/hypervisor.py 2011-05-20 23:18:18.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/hypervisor.py 2012-10-04 23:51:44.000000000 +0200 @@ -7,7 +7,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA # # Base hypervisor class. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/job.py new/vm-install-0.6.11/src/vminstall/job.py --- old/vm-install-0.6.9/src/vminstall/job.py 2012-08-20 19:44:28.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/job.py 2012-10-04 23:46:04.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import os import signal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/keytable.py new/vm-install-0.6.11/src/vminstall/keytable.py --- old/vm-install-0.6.9/src/vminstall/keytable.py 2011-12-10 15:01:34.000000000 +0100 +++ new/vm-install-0.6.11/src/vminstall/keytable.py 2012-10-04 23:52:06.000000000 +0200 @@ -9,7 +9,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA try: from xen.xend import XendOptions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/kvm_guest.py new/vm-install-0.6.11/src/vminstall/kvm_guest.py --- old/vm-install-0.6.9/src/vminstall/kvm_guest.py 2012-08-08 00:19:14.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/kvm_guest.py 2012-10-04 23:56:58.000000000 +0200 @@ -9,7 +9,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import os import time @@ -209,6 +209,12 @@ """Get the graphics config in the libvirt XML format.""" if self.options.graphics == 'none': return [] + graphics = [] + if self.options.graphics == 'vesa': + graphics.append("<video>") + model = ["<model type='vga'/>"] + graphics.append(model) + graphics.append("</video>") ret = '' if self.options.graphics_viewer == 'vnc' or self.options.graphics_viewer == 'virt-viewer': ret = "<graphics type='vnc'" @@ -223,7 +229,15 @@ ret += '/>' elif self.options.graphics_viewer == 'sdl': ret = "<graphics type='sdl'/>" - return [ret] + graphics.append(ret) + return graphics + + def _get_misc_xml(self): + ret = [] + if self.options.os_type == 'oes2nw': + ret.append("<memballoon model='none'/>") + ret.append("<controller type='usb' index='0' model='none'/>") + return ret def GetConfigXml(self): raise RuntimeError('pure virtual') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/kvm_hypervisor.py new/vm-install-0.6.11/src/vminstall/kvm_hypervisor.py --- old/vm-install-0.6.9/src/vminstall/kvm_hypervisor.py 2011-05-20 23:18:18.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/kvm_hypervisor.py 2012-10-04 23:47:30.000000000 +0200 @@ -7,7 +7,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA # # This is the file that communicates with the kvm hypervisor. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/libvirt_console.py new/vm-install-0.6.11/src/vminstall/libvirt_console.py --- old/vm-install-0.6.9/src/vminstall/libvirt_console.py 2011-05-20 23:18:18.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/libvirt_console.py 2012-10-04 23:53:44.000000000 +0200 @@ -10,7 +10,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA ################################################################################ from console import Console diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/libvirt_hypervisor.py new/vm-install-0.6.11/src/vminstall/libvirt_hypervisor.py --- old/vm-install-0.6.9/src/vminstall/libvirt_hypervisor.py 2011-05-20 23:18:18.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/libvirt_hypervisor.py 2012-10-04 23:53:52.000000000 +0200 @@ -7,7 +7,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA # # This is a class that hypervisors that have libvirt support can subclass. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/log.py new/vm-install-0.6.11/src/vminstall/log.py --- old/vm-install-0.6.9/src/vminstall/log.py 2011-05-20 23:18:18.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/log.py 2012-10-04 23:54:05.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import logging import sys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/mount.py new/vm-install-0.6.11/src/vminstall/mount.py --- old/vm-install-0.6.9/src/vminstall/mount.py 2011-05-20 23:18:18.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/mount.py 2012-10-04 23:54:28.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import os import tempfile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/msg.py new/vm-install-0.6.11/src/vminstall/msg.py --- old/vm-install-0.6.9/src/vminstall/msg.py 2012-09-04 23:13:27.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/msg.py 2012-10-04 23:47:37.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import gettext import locale diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/nics.py new/vm-install-0.6.11/src/vminstall/nics.py --- old/vm-install-0.6.9/src/vminstall/nics.py 2011-07-18 21:46:31.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/nics.py 2012-10-04 23:52:45.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import os import string diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/options.py new/vm-install-0.6.11/src/vminstall/options.py --- old/vm-install-0.6.9/src/vminstall/options.py 2012-08-20 19:49:13.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/options.py 2012-10-04 23:45:56.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import os import string @@ -616,7 +616,10 @@ if options.graphics in ('cirrus', 'vesa'): defaults.graphics = options.graphics else: - defaults.graphics = 'cirrus' + if defaults.os_type == 'oes2nw': + defaults.graphics = 'vesa' + else: + defaults.graphics = 'cirrus' else: defaults.graphics = 'para' @@ -765,7 +768,10 @@ defaults.direct_kernel_boot = False else: if defaults.full_virt and vmdefaults.supports_direct_kernel_boot(): - defaults.direct_kernel_boot = vmdefaults.direct_kernel_boot() + if type(defaults.source) is vmdisks.Disk: + defaults.direct_kernel_boot = False + else: + defaults.direct_kernel_boot = vmdefaults.direct_kernel_boot() else: options.direct_kernel_boot = False defaults.direct_kernel_boot = False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/passthrough.py new/vm-install-0.6.11/src/vminstall/passthrough.py --- old/vm-install-0.6.9/src/vminstall/passthrough.py 2012-08-08 00:23:41.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/passthrough.py 2012-10-04 23:50:04.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import caps import util diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/paths.py new/vm-install-0.6.11/src/vminstall/paths.py --- old/vm-install-0.6.9/src/vminstall/paths.py 2012-06-28 23:34:30.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/paths.py 2012-10-04 23:50:53.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import os import globals diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/sound.py new/vm-install-0.6.11/src/vminstall/sound.py --- old/vm-install-0.6.9/src/vminstall/sound.py 2011-07-27 17:37:30.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/sound.py 2012-10-04 23:50:16.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA from exceptions import * import msg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/text/interface.py new/vm-install-0.6.11/src/vminstall/text/interface.py --- old/vm-install-0.6.9/src/vminstall/text/interface.py 2011-11-11 18:31:13.000000000 +0100 +++ new/vm-install-0.6.11/src/vminstall/text/interface.py 2012-10-04 23:55:25.000000000 +0200 @@ -9,7 +9,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import os import sys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/util.py new/vm-install-0.6.11/src/vminstall/util.py --- old/vm-install-0.6.9/src/vminstall/util.py 2012-05-09 22:13:54.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/util.py 2012-10-04 23:48:00.000000000 +0200 @@ -9,7 +9,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import os import random diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/xen_console.py new/vm-install-0.6.11/src/vminstall/xen_console.py --- old/vm-install-0.6.9/src/vminstall/xen_console.py 2011-05-20 23:18:18.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/xen_console.py 2012-10-04 23:54:43.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA ################################################################################ from console import Console diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/xen_guest.py new/vm-install-0.6.11/src/vminstall/xen_guest.py --- old/vm-install-0.6.9/src/vminstall/xen_guest.py 2012-08-08 20:06:21.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/xen_guest.py 2012-10-04 23:46:20.000000000 +0200 @@ -9,7 +9,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import os diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/xen_hypervisor.py new/vm-install-0.6.11/src/vminstall/xen_hypervisor.py --- old/vm-install-0.6.9/src/vminstall/xen_hypervisor.py 2011-05-20 23:18:18.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/xen_hypervisor.py 2012-10-04 23:47:19.000000000 +0200 @@ -9,7 +9,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA # # This is the file that communicates with the xen hypervisor. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.9/src/vminstall/xml.py new/vm-install-0.6.11/src/vminstall/xml.py --- old/vm-install-0.6.9/src/vminstall/xml.py 2011-10-26 19:21:56.000000000 +0200 +++ new/vm-install-0.6.11/src/vminstall/xml.py 2012-10-04 23:50:10.000000000 +0200 @@ -8,7 +8,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA import libxml2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
