Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2014-05-16 18:18:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-06 17:43:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes 2014-05-16 18:18:21.000000000 +0200 @@ -1,0 +2,19 @@ +Thu May 15 11:09:02 MDT 2014 - [email protected] + +- Fix running vm-install in the background +- Version 0.8.19 + +------------------------------------------------------------------- +Wed May 7 17:29:02 MDT 2014 - [email protected] + +- bnc#876340 - vm-install: unsupported configuration: unknown disk + type 'tap2' +- Version 0.8.18 + +------------------------------------------------------------------- +Fri May 2 12:07:02 MDT 2014 - [email protected] + +- Allow logging when vm-install is run in the background +- Version 0.8.17 + +------------------------------------------------------------------- Old: ---- vm-install-0.8.16.tar.bz2 New: ---- vm-install-0.8.19.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.gahKfp/_old 2014-05-16 18:18:22.000000000 +0200 +++ /var/tmp/diff_new_pack.gahKfp/_new 2014-05-16 18:18:22.000000000 +0200 @@ -27,15 +27,15 @@ %endif # For directory ownership: BuildRequires: yast2 -Version: 0.8.16 +Version: 0.8.19 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.16.tar.bz2 +Source0: %{name}-0.8.19.tar.bz2 Source1: vm-install.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 x86_64 s390x +ExclusiveArch: %ix86 x86_64 s390x ppc64le Requires: dbus-1-python Requires: kdump Requires: libvirt-python ++++++ vm-install-0.8.16.tar.bz2 -> vm-install-0.8.19.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.16/Makefile new/vm-install-0.8.19/Makefile --- old/vm-install-0.8.16/Makefile 2014-05-02 01:14:56.000000000 +0200 +++ new/vm-install-0.8.19/Makefile 2014-05-15 19:11:02.000000000 +0200 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.8.16 +VER = 0.8.19 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.16/po/xen-vm-install.pot new/vm-install-0.8.19/po/xen-vm-install.pot --- old/vm-install-0.8.16/po/xen-vm-install.pot 2014-05-02 01:14:56.000000000 +0200 +++ new/vm-install-0.8.19/po/xen-vm-install.pot 2014-05-09 02:43:09.000000000 +0200 @@ -8,10 +8,11 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-20 13:04-0600\n" +"POT-Creation-Date: 2014-05-08 18:43-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" @@ -616,142 +617,146 @@ msgid "Managed" msgstr "" -#: src/vminstall/msg.py:206 -msgid "Create a Virtual Machine" +#: src/vminstall/msg.py:204 +msgid "Storage Format" msgstr "" #: src/vminstall/msg.py:207 -msgid "Install an Operating System?" +msgid "Create a Virtual Machine" msgstr "" #: src/vminstall/msg.py:208 -msgid "Type of Operating System" +msgid "Install an Operating System?" msgstr "" #: src/vminstall/msg.py:209 -msgid "Summary" +msgid "Type of Operating System" msgstr "" #: src/vminstall/msg.py:210 -msgid "Virtualization Method" +msgid "Summary" msgstr "" #: src/vminstall/msg.py:211 -msgid "Name of Virtual Machine" +msgid "Virtualization Method" msgstr "" #: src/vminstall/msg.py:212 -msgid "Hardware" +msgid "Name of Virtual Machine" msgstr "" #: src/vminstall/msg.py:213 -msgid "Peripheral Devices" +msgid "Hardware" msgstr "" #: src/vminstall/msg.py:214 +msgid "Peripheral Devices" +msgstr "" + +#: src/vminstall/msg.py:215 msgid "Disks" msgstr "" -#: src/vminstall/msg.py:215 src/vminstall/msg.py:295 +#: src/vminstall/msg.py:216 src/vminstall/msg.py:296 msgid "Virtual Disk" msgstr "" -#: src/vminstall/msg.py:216 +#: src/vminstall/msg.py:217 msgid "Network Adapters" msgstr "" -#: src/vminstall/msg.py:217 +#: src/vminstall/msg.py:218 msgid "Virtual Network Adapter" msgstr "" -#: src/vminstall/msg.py:218 +#: src/vminstall/msg.py:219 msgid "Operating System Installation" msgstr "" -#: src/vminstall/msg.py:219 +#: src/vminstall/msg.py:220 msgid "Operating System Settings" msgstr "" -#: src/vminstall/msg.py:220 +#: src/vminstall/msg.py:221 msgid "Operating System Upgrade" msgstr "" -#: src/vminstall/msg.py:221 +#: src/vminstall/msg.py:222 msgid "Advanced Settings" msgstr "" -#: src/vminstall/msg.py:222 src/vminstall/msg.py:285 +#: src/vminstall/msg.py:223 src/vminstall/msg.py:286 msgid "Host Devices" msgstr "" -#: src/vminstall/msg.py:225 +#: src/vminstall/msg.py:226 msgid "" "This assistant will guide you through creating a new virtual machine (VM). " "You will be asked for some information about the VM you'd like to create, " "such as:" msgstr "" -#: src/vminstall/msg.py:226 +#: src/vminstall/msg.py:227 msgid "The <b>type of operating system</b> that will run in the new VM" msgstr "" -#: src/vminstall/msg.py:227 +#: src/vminstall/msg.py:228 msgid "" "Whether the VM will be <b>fully virtualized</b> or <b>paravirtualized</b>" msgstr "" -#: src/vminstall/msg.py:228 +#: src/vminstall/msg.py:229 msgid "" "The <b>location</b> of the files necessary to install an operating system on " "the VM, or a <b>disk</b> that already has an operating system" msgstr "" -#: src/vminstall/msg.py:229 +#: src/vminstall/msg.py:230 msgid "" "Other characteristics of the VM, such as <b>memory</b>, <b>processors</b>, " "and <b>network adapters</b>." msgstr "" #. TRANSLATORS Do not translate %(url)s -#: src/vminstall/msg.py:231 +#: src/vminstall/msg.py:232 msgid "For the most current information on SUSE VM server technology, see " msgstr "" -#: src/vminstall/msg.py:232 +#: src/vminstall/msg.py:233 #, python-format msgid "%(url)s" msgstr "" -#: src/vminstall/msg.py:233 +#: src/vminstall/msg.py:234 msgid "" "If you are creating this VM from scratch, you will need to install an " "operating system. When migrating a physical machine to a virtual machine, " "the disk with the existing operating system can often be reused for the VM." msgstr "" -#: src/vminstall/msg.py:234 +#: src/vminstall/msg.py:235 msgid "I need to install an operating system." msgstr "" -#: src/vminstall/msg.py:235 +#: src/vminstall/msg.py:236 msgid "I have a disk or disk image with an installed operating system." msgstr "" -#: src/vminstall/msg.py:236 +#: src/vminstall/msg.py:237 msgid "I need to upgrade an existing operating system." msgstr "" -#: src/vminstall/msg.py:237 +#: src/vminstall/msg.py:238 msgid "Please choose a name for the virtual machine." msgstr "" -#: src/vminstall/msg.py:238 +#: src/vminstall/msg.py:239 msgid "" "Click any headline to make changes. When the settings are correct, click " "<b>OK</b> to create the VM." msgstr "" -#: src/vminstall/msg.py:239 +#: src/vminstall/msg.py:240 msgid "" "Virtual machines can use paravirtualization or full virtualization. " "Paravirtualization is faster but requires operating system support. Full " @@ -759,54 +764,54 @@ "hardware support. Which do you prefer?" msgstr "" -#: src/vminstall/msg.py:240 +#: src/vminstall/msg.py:241 msgid "" "Please specify the type of operating system that will run within the virtual " "machine. This defines many defaults, and helps decide how to start " "paravirtualized operating systems." msgstr "" -#: src/vminstall/msg.py:241 +#: src/vminstall/msg.py:242 msgid "" "Some operating systems support automating the installation by specifying a " "URL or file(s). Select a directory to include multiple files." msgstr "" -#: src/vminstall/msg.py:243 +#: src/vminstall/msg.py:244 msgid "" "Some operating systems accept additional arguments, used to customize the " "installation or boot process." msgstr "" -#: src/vminstall/msg.py:244 +#: src/vminstall/msg.py:245 msgid "" "Select the behavior when the operating system exits with power off, reboot " "or crash. Settings take effect after installation is complete." msgstr "" -#: src/vminstall/msg.py:247 +#: src/vminstall/msg.py:248 msgid "" "Specify the bootable virtual disk (often labeled as Disk 1) or the network " "installation source URL. Each CD, DVD, or ISO image required for " "installation must be added as a virtual disk." msgstr "" -#: src/vminstall/msg.py:250 +#: src/vminstall/msg.py:251 msgid "" "Create a virtual disk based on a device (CD or other block device), an " "existing image file (ISO), or a new file. Specify a device by its device " "node, such as /dev/cdrom, not its mount point." msgstr "" -#: src/vminstall/msg.py:251 +#: src/vminstall/msg.py:252 msgid "Please specify the settings for the virtual network adapter." msgstr "" -#: src/vminstall/msg.py:252 +#: src/vminstall/msg.py:253 msgid "Press 'q' or the Escape key to exit." msgstr "" -#: src/vminstall/msg.py:253 +#: src/vminstall/msg.py:254 msgid "" "Warning: Vm-install automatically manages these configuration settings " "depending on the operating system to be installed. It is expected that you " @@ -814,387 +819,387 @@ "setting." msgstr "" -#: src/vminstall/msg.py:254 +#: src/vminstall/msg.py:255 msgid "Reset to Defaults" msgstr "" -#: src/vminstall/msg.py:255 +#: src/vminstall/msg.py:256 msgid "" "Setting the maximum memory greater than the initial memory requires the VM " "operating system to have a memory balloon driver." msgstr "" -#: src/vminstall/msg.py:258 +#: src/vminstall/msg.py:259 msgid "" "Specify the amount of memory and number of processors to allocate for the VM." msgstr "" -#: src/vminstall/msg.py:259 +#: src/vminstall/msg.py:260 msgid "" "For best performance, the number of virtual processors should be less than " "or equal to the number of physical processors." msgstr "" -#: src/vminstall/msg.py:262 +#: src/vminstall/msg.py:263 msgid "" "Paravirtualized graphics require that an appropriate driver is installed in " "the operating system." msgstr "" -#: src/vminstall/msg.py:263 +#: src/vminstall/msg.py:264 msgid "" "The VM will operate like a server without a monitor. You may still access " "the operating system via the virtualized serial port, or through any " "operating system supported services such as ssh or VNC." msgstr "" -#: src/vminstall/msg.py:264 +#: src/vminstall/msg.py:265 msgid "Please specify the type of virtualized graphics hardware." msgstr "" -#: src/vminstall/msg.py:265 +#: src/vminstall/msg.py:266 msgid "Paravirtualized Graphics Adapter" msgstr "" -#: src/vminstall/msg.py:266 +#: src/vminstall/msg.py:267 msgid "VESA VGA" msgstr "" -#: src/vminstall/msg.py:267 +#: src/vminstall/msg.py:268 msgid "Cirrus Logic GD5446 VGA" msgstr "" -#: src/vminstall/msg.py:268 +#: src/vminstall/msg.py:269 msgid "No Graphics Support" msgstr "" -#: src/vminstall/msg.py:269 +#: src/vminstall/msg.py:270 msgid "Graphics Adapter" msgstr "" -#: src/vminstall/msg.py:270 +#: src/vminstall/msg.py:271 msgid "Screen Resolution" msgstr "" -#: src/vminstall/msg.py:272 +#: src/vminstall/msg.py:273 msgid "Please specify the keyboard translation map file." msgstr "" -#: src/vminstall/msg.py:275 +#: src/vminstall/msg.py:276 msgid "Please specify the sound device." msgstr "" -#: src/vminstall/msg.py:276 +#: src/vminstall/msg.py:277 msgid "Intel 82801AA Audio Codec 97" msgstr "" -#: src/vminstall/msg.py:277 +#: src/vminstall/msg.py:278 msgid "Ensoniq AudioPCI ES1370" msgstr "" -#: src/vminstall/msg.py:278 +#: src/vminstall/msg.py:279 msgid "Intel I/O Controller Hub 6 (ICH6)" msgstr "" -#: src/vminstall/msg.py:279 +#: src/vminstall/msg.py:280 msgid "Creative Sound Blaster 16" msgstr "" -#: src/vminstall/msg.py:280 +#: src/vminstall/msg.py:281 msgid "No Sound Support" msgstr "" -#: src/vminstall/msg.py:281 +#: src/vminstall/msg.py:282 msgid "All" msgstr "" -#: src/vminstall/msg.py:282 +#: src/vminstall/msg.py:283 msgid "Sound Card" msgstr "" -#: src/vminstall/msg.py:286 +#: src/vminstall/msg.py:287 msgid "" "Specify a host device for the VM. This will give the VM direct access to " "the device." msgstr "" -#: src/vminstall/msg.py:287 +#: src/vminstall/msg.py:288 msgid "Host devices cannot be shared between VMs or between a VM and the host." msgstr "" -#: src/vminstall/msg.py:288 +#: src/vminstall/msg.py:289 msgid "Manage VM Devices" msgstr "" -#: src/vminstall/msg.py:289 +#: src/vminstall/msg.py:290 msgid "Defined VM Devices" msgstr "" -#: src/vminstall/msg.py:290 +#: src/vminstall/msg.py:291 msgid "PCI Host Devices" msgstr "" -#: src/vminstall/msg.py:291 +#: src/vminstall/msg.py:292 msgid "USB Host Devices" msgstr "" -#: src/vminstall/msg.py:292 +#: src/vminstall/msg.py:293 msgid "" "Do not add a PCI or USB device to this VM that is needed by the host to " "function properly." msgstr "" -#: src/vminstall/msg.py:296 +#: src/vminstall/msg.py:297 msgid "Virtual Disks" msgstr "" -#: src/vminstall/msg.py:297 +#: src/vminstall/msg.py:298 msgid "PXE Boot" msgstr "" -#: src/vminstall/msg.py:298 +#: src/vminstall/msg.py:299 msgid "Size (GB)" msgstr "" -#: src/vminstall/msg.py:299 +#: src/vminstall/msg.py:300 msgid "Create Sparse Image File" msgstr "" -#: src/vminstall/msg.py:300 +#: src/vminstall/msg.py:301 msgid "Read-Only Access" msgstr "" -#: src/vminstall/msg.py:301 +#: src/vminstall/msg.py:302 msgid "Hard Disk" msgstr "" -#: src/vminstall/msg.py:302 +#: src/vminstall/msg.py:303 msgid "CD-ROM or DVD" msgstr "" -#: src/vminstall/msg.py:303 +#: src/vminstall/msg.py:304 msgid "Floppy Disk" msgstr "" -#: src/vminstall/msg.py:304 +#: src/vminstall/msg.py:305 msgid "PXE" msgstr "" -#: src/vminstall/msg.py:305 +#: src/vminstall/msg.py:306 msgid "Relax and Recover" msgstr "" -#: src/vminstall/msg.py:306 +#: src/vminstall/msg.py:307 msgid "Cache Mode" msgstr "" -#: src/vminstall/msg.py:309 +#: src/vminstall/msg.py:310 msgid "" "Can't reach the pxe server. Possible reasons are an improperly configured " "network or firewall restrictions." msgstr "" -#: src/vminstall/msg.py:310 +#: src/vminstall/msg.py:311 msgid "Can't get the pxelinux.cfg/default file from the pxe server." msgstr "" -#: src/vminstall/msg.py:311 +#: src/vminstall/msg.py:312 msgid "Can't download the kernel and initrd from the server." msgstr "" -#: src/vminstall/msg.py:312 +#: src/vminstall/msg.py:313 msgid "" "This kernel image may not be a paravirtualized xen kernel required for " "installation, Continue?" msgstr "" -#: src/vminstall/msg.py:313 +#: src/vminstall/msg.py:314 msgid "Unable to identify a configured network bridge." msgstr "" -#: src/vminstall/msg.py:314 +#: src/vminstall/msg.py:315 msgid "" "Paravirtualized PXE booting requires the use of tftp or atftp. Please " "install one of these packages." msgstr "" -#: src/vminstall/msg.py:317 +#: src/vminstall/msg.py:318 msgid "Fully Virtualized Intel e100" msgstr "" -#: src/vminstall/msg.py:318 +#: src/vminstall/msg.py:319 msgid "Fully Virtualized Intel e1000" msgstr "" -#: src/vminstall/msg.py:319 +#: src/vminstall/msg.py:320 msgid "Fully Virtualized Intel eepro100" msgstr "" -#: src/vminstall/msg.py:320 +#: src/vminstall/msg.py:321 msgid "Fully Virtualized AMD PCnet 32" msgstr "" -#: src/vminstall/msg.py:321 +#: src/vminstall/msg.py:322 msgid "Fully Virtualized NE2000 (ISA Bus)" msgstr "" -#: src/vminstall/msg.py:322 +#: src/vminstall/msg.py:323 msgid "Fully Virtualized NE2000 (PCI Bus)" msgstr "" -#: src/vminstall/msg.py:323 +#: src/vminstall/msg.py:324 msgid "Fully Virtualized Realtek 8139" msgstr "" -#: src/vminstall/msg.py:324 +#: src/vminstall/msg.py:325 msgid "MAC Address" msgstr "" -#: src/vminstall/msg.py:325 +#: src/vminstall/msg.py:326 msgid "Randomly generated MAC address" msgstr "" -#: src/vminstall/msg.py:326 +#: src/vminstall/msg.py:327 msgid "Specified MAC address" msgstr "" -#: src/vminstall/msg.py:329 +#: src/vminstall/msg.py:330 msgid "Additional Arguments" msgstr "" -#: src/vminstall/msg.py:330 +#: src/vminstall/msg.py:331 msgid "Network URL" msgstr "" -#: src/vminstall/msg.py:331 +#: src/vminstall/msg.py:332 msgid "Memory" msgstr "" -#: src/vminstall/msg.py:332 +#: src/vminstall/msg.py:333 msgid "Processors" msgstr "" -#: src/vminstall/msg.py:333 +#: src/vminstall/msg.py:334 msgid "Automated install file or URL" msgstr "" -#: src/vminstall/msg.py:334 +#: src/vminstall/msg.py:335 msgid "Available Memory" msgstr "" -#: src/vminstall/msg.py:335 +#: src/vminstall/msg.py:336 msgid "Available Processors" msgstr "" -#: src/vminstall/msg.py:336 +#: src/vminstall/msg.py:337 msgid "Initial Memory" msgstr "" -#: src/vminstall/msg.py:337 +#: src/vminstall/msg.py:338 msgid "Maximum Memory" msgstr "" -#: src/vminstall/msg.py:338 +#: src/vminstall/msg.py:339 msgid "Virtual Processors" msgstr "" -#: src/vminstall/msg.py:339 +#: src/vminstall/msg.py:340 msgid "Installation Source" msgstr "" -#: src/vminstall/msg.py:340 +#: src/vminstall/msg.py:341 msgid "Automated Installation" msgstr "" -#: src/vminstall/msg.py:341 +#: src/vminstall/msg.py:342 msgid "Operating System" msgstr "" -#: src/vminstall/msg.py:342 +#: src/vminstall/msg.py:343 msgid "Power Off" msgstr "" -#: src/vminstall/msg.py:343 +#: src/vminstall/msg.py:344 msgid "Reboot" msgstr "" -#: src/vminstall/msg.py:344 +#: src/vminstall/msg.py:345 msgid "Crash" msgstr "" -#: src/vminstall/msg.py:354 +#: src/vminstall/msg.py:355 msgid "Kickstart file or URL" msgstr "" -#: src/vminstall/msg.py:355 +#: src/vminstall/msg.py:356 msgid "AutoYaST file" msgstr "" -#: src/vminstall/msg.py:356 +#: src/vminstall/msg.py:357 msgid "NetWare response file" msgstr "" -#: src/vminstall/msg.py:359 +#: src/vminstall/msg.py:360 msgid "Creating the Virtual Machine" msgstr "" -#: src/vminstall/msg.py:360 +#: src/vminstall/msg.py:361 msgid "Writing the configuration file" msgstr "" -#: src/vminstall/msg.py:361 +#: src/vminstall/msg.py:362 msgid "Locate Operating System Settings File" msgstr "" -#: src/vminstall/msg.py:362 +#: src/vminstall/msg.py:363 msgid "Locate Disk or Disk Image" msgstr "" -#: src/vminstall/msg.py:365 +#: src/vminstall/msg.py:366 msgid "Do you want to add another virtual disk?" msgstr "" -#: src/vminstall/msg.py:366 +#: src/vminstall/msg.py:367 msgid "Do you want to add another virtual network adapter?" msgstr "" -#: src/vminstall/msg.py:367 +#: src/vminstall/msg.py:368 msgid "What type of virtual disk do you want to add?" msgstr "" -#: src/vminstall/msg.py:368 +#: src/vminstall/msg.py:369 msgid "Where will the virtual disk physically reside?" msgstr "" -#: src/vminstall/msg.py:369 +#: src/vminstall/msg.py:370 msgid "What type of virtual network adapter do you want to add?" msgstr "" -#: src/vminstall/msg.py:370 +#: src/vminstall/msg.py:371 msgid "Create a sparse image file for the virtual disk?" msgstr "" -#: src/vminstall/msg.py:372 +#: src/vminstall/msg.py:373 msgid "Default" msgstr "" -#: src/vminstall/msg.py:375 +#: src/vminstall/msg.py:376 msgid "Operating System Type" msgstr "" -#: src/vminstall/msg.py:376 +#: src/vminstall/msg.py:377 msgid "Managed Virtual Machines" msgstr "" -#: src/vminstall/msg.py:377 +#: src/vminstall/msg.py:378 msgid "Configuration File" msgstr "" -#: src/vminstall/msg.py:378 +#: src/vminstall/msg.py:379 msgid "Specify the URL containing the network installation source." msgstr "" -#: src/vminstall/msg.py:381 +#: src/vminstall/msg.py:382 msgid "" "A hypervisor is not running. For kvm, load the kvm kernel modules. If you " "want to run xen, reboot and load the xen kernel." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.16/setup.py new/vm-install-0.8.19/setup.py --- old/vm-install-0.8.16/setup.py 2014-05-02 01:14:56.000000000 +0200 +++ new/vm-install-0.8.19/setup.py 2014-05-15 19:10:59.000000000 +0200 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.8.16', + version='0.8.19', 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.16/src/vmdisks/disks.py new/vm-install-0.8.19/src/vmdisks/disks.py --- old/vm-install-0.8.16/src/vmdisks/disks.py 2014-05-02 01:14:51.000000000 +0200 +++ new/vm-install-0.8.19/src/vmdisks/disks.py 2014-05-09 02:41:30.000000000 +0200 @@ -366,17 +366,16 @@ 'nbd': Driver('nbd'), 'npiv': Driver('npiv'), 'phy': PhyDriver('phy'), - 'tap:aio': TapAioDriver('tap:aio'), - 'tap2:tapdisk:aio': TapAioDriver('tap2:tapdisk:aio'), + 'qcow2': QemuDriver('qcow2'), + 'vhd': Tap2VHDDriver('vhd'), 'tap:cdrom': TapCdromDriver('tap:cdrom'), 'tap:qcow2': TapQcow2Driver('tap:qcow2'), - 'tap2:tapdisk:qcow2': TapQcow2Driver('tap2:tapdisk:qcow2'), 'tap:vhd': Tap2VHDDriver('tap:vhd'), - 'tap2:tapdisk:vhd': Tap2VHDDriver('tap2:tapdisk:vhd'), 'tap:vmdk': TapVmdkDriver('tap:vmdk'), - 'tap2:tapdisk:vmdk': TapVmdkDriver('tap2:tapdisk:vmdk'), } -disk_protocols = ["file:", "iscsi:", "nbd:", "npiv:", "phy:", "tap:aio:", "tap2:tapdisk:aio:", "tap:cdrom:", "tap:qcow2:", "tap2:tapdisk:qcow2:", "tap:vhd:", "tap2:tapdisk:vhd:", "tap:vmdk:", "tap2:tapdisk:vmdk:"] +xend_protocols = ["file:", "iscsi:", "nbd:", "npiv:", "phy:", "tap:cdrom:", "tap:qcow2:", "tap:vhd:", "tap:vmdk:"] +xl_protocols = ["file:", "iscsi:", "nbd:", "npiv:", "phy:", "qcow2:", "vhd:"] + KVM_DRIVERS = { 'bochs': QemuDriver('bochs'), 'cloop': QemuDriver('cloop'), @@ -398,19 +397,15 @@ protocol_file_extensions = { 'file': "raw", - 'tap:aio': "raw", - 'tap2:tapdisk:aio': "raw", 'raw': "raw", - 'tap:qcow2': "qcow2", 'qcow2': "qcow2", - 'tap2:tapdisk:qcow2': "qcow2", + 'tap:qcow2': "qcow2", 'qcow': "qcow", 'qed': "qed", - 'tap:vmdk': "vmdk", - 'tap2:tapdisk:vmdk': "vmdk", 'vmdk': "vmdk", + 'tap:vmdk': "vmdk", + 'vhd': "vhd", 'tap:vhd': "vhd", - 'tap2:tapdisk:vhd': "vhd", 'vpc': "vpc", 'vvfat': "vfat", 'dmg': "dmg", @@ -421,12 +416,12 @@ } file_extension_protocols = { - 'raw': ['file','tap2:tapdisk:aio','tap:aio','raw'], - 'qcow2': ['tap2:tapdisk:qcow2','tap:qcow2','qcow2'], + 'raw': ['file','raw'], + 'qcow2': ['qcow2','tap:qcow2'], 'qcow': ['qcow'], 'qed': ['qed'], - 'vmdk': ['tap2:tapdisk:vmdk','tap:vmdk','vmdk'], - 'vhd': ['tap2:tapdisk:vhd','tap:vhd'], + 'vmdk': ['vmdk','tap:vmdk'], + 'vhd': ['vhd','tap:vhd'], 'vpc': ['vpc'], 'vfat': ['vvfat'], 'dmg': ['dmg'], @@ -530,6 +525,14 @@ disk._cache_mode = cache_mode return disk +def get_disk_protocols(): + if vminstall.caps.is_kvm() or vminstall.caps.is_qemu(): + return kvm_disk_protocols + else: + if vminstall.util.is_xend_running(): + return xend_protocols + return xl_protocols + #------------------------------------------------------------------------------- # Function: split_driver_path @@ -621,10 +624,7 @@ self.set_ro(ro) self.args = args - if vminstall.caps.is_kvm() or vminstall.caps.is_qemu(): - self._protocols = kvm_disk_protocols - else: - self._protocols = disk_protocols + self._protocols = get_disk_protocols() def __del__(self): self.block_detach() @@ -739,7 +739,9 @@ struct.unpack('H', buf[0x002: 0x004]) == (0xfb49,): log.info("Qcow image signature found on '%s'." % image) if vminstall.caps.is_xen(): - return "tap:qcow2:" + if vminstall.util.is_xend_running(): + return "tap:qcow2:" + return "qcow2:" else: return "qcow2:" # Check for the vmdk image signature 'V','M','D' 'K' @@ -747,7 +749,9 @@ struct.unpack('H', buf[0x002: 0x004]) == (0x564d,): log.info("Vmdk image signature found on '%s'." % image) if vminstall.caps.is_xen(): - return "tap:vmdk:" + if vminstall.util.is_xend_running(): + return "tap:vmdk:" + return "vmdk:" else: return "vmdk:" # Check for the vpc image signature 'c','o','n' 'e' 'c' 't' 'i' 'x' @@ -757,7 +761,9 @@ struct.unpack('H', buf[0x006: 0x008]) == (0x7869,): log.info("Vpc (vhd) image signature found on '%s'." % image) if vminstall.caps.is_xen(): - return "tap:vhd:" + if vminstall.util.is_xend_running(): + return "tap:vhd:" + return "vhd:" else: return "vpc:" # Simple filename examination - Could be a lie @@ -1187,7 +1193,13 @@ if self._vdevType == self.DEVICE_CDROM: vdev += ':cdrom' mode = 'r' - return "'%s,%s,%s'" % (self.get_pdev(), vdev, mode) + if vminstall.util.is_xend_running(): + return "'%s,%s,%s'" % (self.get_pdev(), vdev, mode) + # xl disk config file format: ['target','format','vdev','access'] + proto = self.get_proto() + if proto == 'file': + proto = 'raw' + return "'%s,%s,%s,%s'" % (self.get_path(), proto, vdev, mode) def __str__(self): size = '' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.16/src/vminstall/gtk/chooser.py new/vm-install-0.8.19/src/vminstall/gtk/chooser.py --- old/vm-install-0.8.16/src/vminstall/gtk/chooser.py 2014-05-02 01:14:51.000000000 +0200 +++ new/vm-install-0.8.19/src/vminstall/gtk/chooser.py 2014-05-12 21:17:49.000000000 +0200 @@ -1,5 +1,5 @@ import gtk -from vmdisks.disks import disk_protocols +import vmdisks def chooser(dialog_name, topwin, mode=gtk.FILE_CHOOSER_ACTION_OPEN, file=None, folder=None, type=None): @@ -9,9 +9,10 @@ if file: index=0 filename = file - while index < len(disk_protocols): - if file.startswith(disk_protocols[index]): - filename = file[len(disk_protocols[index]):] + protocols = vmdisks.get_disk_protocols() + while index < len(protocols): + if file.startswith(protocols[index]): + filename = file[len(protocols[index]):] break index += 1 file = filename diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.16/src/vminstall/gtk/disk_widgets.py new/vm-install-0.8.19/src/vminstall/gtk/disk_widgets.py --- old/vm-install-0.8.16/src/vminstall/gtk/disk_widgets.py 2014-05-02 01:14:51.000000000 +0200 +++ new/vm-install-0.8.19/src/vminstall/gtk/disk_widgets.py 2014-05-12 21:17:49.000000000 +0200 @@ -17,7 +17,7 @@ import vmdisks from tree_view import * from chooser import * -from vmdisks.disks import disk_protocols, kvm_disk_protocols +from vmdisks.disks import get_disk_protocols from vmdisks.disks import protocol_file_extensions, file_extension_protocols class DisksView(PyTreeView): @@ -205,10 +205,7 @@ self.disk_edit_widget.get_parent().remove(self.disk_edit_widget) self.topwin.destroy() - if vminstall.caps.is_kvm() or vminstall.caps.is_qemu(): - self._protocols = kvm_disk_protocols - else: - self._protocols = disk_protocols + self._protocols = vmdisks.get_disk_protocols() combo = self.glade.get_widget('disk-protocol') model = gtk.ListStore(gobject.TYPE_STRING) for item in self._protocols: @@ -239,7 +236,7 @@ set_text('disk_help') set_text('disk_location', text=vminstall.msg.source, modifier=prompt) set_text('disk_browse', text=vminstall.msg.browse) - set_text('virtual-disk-protocol', text=vminstall.msg.protocol, modifier=prompt) + set_text('virtual-disk-protocol', text=vminstall.msg.storage_format, modifier=prompt) set_text('disk-name-prompt', text=vminstall.msg.name, modifier=prompt) set_text('disk_size', text=vminstall.msg.size_gb, modifier=prompt) set_text('cache_mode', text=vminstall.msg.cache_mode, modifier=prompt) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.16/src/vminstall/job.py new/vm-install-0.8.19/src/vminstall/job.py --- old/vm-install-0.8.16/src/vminstall/job.py 2014-05-02 01:14:53.000000000 +0200 +++ new/vm-install-0.8.19/src/vminstall/job.py 2014-05-15 19:08:58.000000000 +0200 @@ -87,6 +87,7 @@ self._update_job_file() if not util.daemonize(cb=init): os._exit(0) + hypervisor.connection.reset_connection() init_log(debug=debug, filename=self.logfn) else: init_log(debug=debug) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.16/src/vminstall/libvirt_console.py new/vm-install-0.8.19/src/vminstall/libvirt_console.py --- old/vm-install-0.8.16/src/vminstall/libvirt_console.py 2014-05-02 01:14:53.000000000 +0200 +++ new/vm-install-0.8.19/src/vminstall/libvirt_console.py 2014-05-15 15:26:35.000000000 +0200 @@ -145,7 +145,7 @@ if u == uuid: time.sleep(3.0) continue - break + break except: log.debug("Libvirt exception means guest has exited. '%s'" % uuid) break diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.16/src/vminstall/libvirt_hypervisor.py new/vm-install-0.8.19/src/vminstall/libvirt_hypervisor.py --- old/vm-install-0.8.16/src/vminstall/libvirt_hypervisor.py 2014-05-02 01:14:53.000000000 +0200 +++ new/vm-install-0.8.19/src/vminstall/libvirt_hypervisor.py 2014-05-15 19:07:38.000000000 +0200 @@ -146,11 +146,15 @@ #--------------------------------------------------------------------------- # Method: reset_connection #--------------------------------------------------------------------------- - def reset_connection(self): + def reset_connection(self, uri=None): if self.virConn is not None: + uri = self.virConn.getURI() self.virConn.close() self.virConn = None - hypervisor.connection = LibVirtHypervisor("qemu:///system") + if uri is None: + hypervisor.connection = LibVirtHypervisor("qemu:///system") + else: + hypervisor.connection = LibVirtHypervisor(uri) return self.virConn diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.16/src/vminstall/msg.py new/vm-install-0.8.19/src/vminstall/msg.py --- old/vm-install-0.8.16/src/vminstall/msg.py 2014-05-02 01:14:53.000000000 +0200 +++ new/vm-install-0.8.19/src/vminstall/msg.py 2014-05-12 21:17:49.000000000 +0200 @@ -201,6 +201,7 @@ option = _("Option") random = _("Random") managed = _("Managed") +storage_format = _("Storage Format") # Titles on pages title_intro = _("Create a Virtual Machine") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.16/src/vminstall/text/interface.py new/vm-install-0.8.19/src/vminstall/text/interface.py --- old/vm-install-0.8.16/src/vminstall/text/interface.py 2014-05-02 01:14:51.000000000 +0200 +++ new/vm-install-0.8.19/src/vminstall/text/interface.py 2014-05-12 21:17:49.000000000 +0200 @@ -29,7 +29,8 @@ def output(s): if not isinstance(s, str): s = str(s) - sys.stdout.write(s) + if not options.background: + sys.stdout.write(s) def output_wrap(s): output(vminstall.util.wrap(s)) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
