Hello community,
here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2013-10-03 13:00:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2013-09-13 14:45:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes 2013-10-03 13:00:28.000000000 +0200
@@ -1,0 +2,19 @@
+Wed Oct 2 15:52:12 MDT 2013 - carnold@suse.com
+
+- Updated language files
+
+-------------------------------------------------------------------
+Thu Sep 19 10:58:10 MDT 2013 - carnold@suse.com
+
+- bnc#825292 - Hamsta install virtual host does not create a disk
+ Works around libvirt internal client socket error
+- Version 0.7.8
+
+-------------------------------------------------------------------
+Fri Sep 13 12:48:49 MDT 2013 - carnold@suse.com
+
+- bnc#825292 - Hamsta install virtual host does not create a disk
+ Fixes PXE boot max memory less that initial memory
+- Version 0.7.7
+
+-------------------------------------------------------------------
Old:
----
vm-install-0.7.6.tar.bz2
New:
----
vm-install-0.7.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vm-install.spec ++++++
--- /var/tmp/diff_new_pack.l5RtnA/_old 2013-10-03 13:00:29.000000000 +0200
+++ /var/tmp/diff_new_pack.l5RtnA/_new 2013-10-03 13:00:29.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.7.6
+Version: 0.7.8
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.7.6.tar.bz2
+Source0: %{name}-0.7.8.tar.bz2
Source1: vm-install.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 s390x
++++++ vm-install-0.7.6.tar.bz2 -> vm-install-0.7.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.7.6/Makefile new/vm-install-0.7.8/Makefile
--- old/vm-install-0.7.6/Makefile 2013-09-06 17:14:50.000000000 +0200
+++ new/vm-install-0.7.8/Makefile 2013-10-02 23:53:41.000000000 +0200
@@ -1,5 +1,5 @@
PACKAGE = vm-install
-VER = 0.7.6
+VER = 0.7.8
default:
@echo "Run 'make install DESTDIR=$destdir' to install."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.7.6/po/da.po new/vm-install-0.7.8/po/da.po
--- old/vm-install-0.7.6/po/da.po 2013-09-12 14:37:35.000000000 +0200
+++ new/vm-install-0.7.8/po/da.po 2013-10-02 23:51:29.000000000 +0200
@@ -7,7 +7,7 @@
"Project-Id-Version: xen-vm-install\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-08-01 09:23-0600\n"
-"PO-Revision-Date: 2013-08-20 21:01+0200\n"
+"PO-Revision-Date: 2013-09-30 20:57+0200\n"
"Last-Translator: Martin Schlander \n"
"Language-Team: Danish \n"
"Language: da\n"
@@ -99,8 +99,12 @@
#: src/vminstall/msg.py:50
#, python-format
-msgid "Failed to display the VM's console because DISPLAY is not set. Please connect a VNC viewer to %s:%d."
-msgstr "Kunne ikke vise VM'ens konsol fordi DISPLAY ikke er sat. Forbind venligst en VNC-fremviser til %s:%d."
+msgid ""
+"Failed to display the VM's console because DISPLAY is not set. Please "
+"connect a VNC viewer to %s:%d."
+msgstr ""
+"Kunne ikke vise VM'ens konsol fordi DISPLAY ikke er sat. Forbind venligst en "
+"VNC-fremviser til %s:%d."
#: src/vminstall/msg.py:51
msgid "Failed to display the VM's console. Please connect a viewer manually."
@@ -144,7 +148,8 @@
#: src/vminstall/msg.py:66
msgid "A valid boot sector was not found. The installation may have failed."
-msgstr "En gyldig boot-sektor blev ikke fundet. Installationen kan være fejlet."
+msgstr ""
+"En gyldig boot-sektor blev ikke fundet. Installationen kan være fejlet."
#: src/vminstall/msg.py:67
msgid "No kernel was found. The installation may have failed."
@@ -183,16 +188,23 @@
msgstr "En fejl opstod under læsning fra konfigurationsfilen."
#: src/vminstall/msg.py:80
-msgid "The operating system is incompatible with the processor architecture of this machine."
-msgstr "Operativsystemet er inkompatibelt med denne maskines processorarkitektur."
+msgid ""
+"The operating system is incompatible with the processor architecture of this "
+"machine."
+msgstr ""
+"Operativsystemet er inkompatibelt med denne maskines processorarkitektur."
#: src/vminstall/msg.py:81
msgid "The processor(s) in this machine do not support full virtualization."
msgstr "Processoren(e) i denne maskine understøtter ikke fuld virtualisering."
#: src/vminstall/msg.py:82
-msgid "The processor(s) in this machine support full virtualization, but it is disabled in the BIOS."
-msgstr "Processoren(e) i denne maskine understøtter fuld virtualisering, men det er deaktiveret i BIOS."
+msgid ""
+"The processor(s) in this machine support full virtualization, but it is "
+"disabled in the BIOS."
+msgstr ""
+"Processoren(e) i denne maskine understøtter fuld virtualisering, men det er "
+"deaktiveret i BIOS."
#: src/vminstall/msg.py:85
msgid "Not enough memory."
@@ -235,8 +247,11 @@
msgstr "Der blev nægtet tilladelse til at tilgå disken."
#: src/vminstall/msg.py:99
-msgid "Two of the virtual disks have conflicting virtual names or physical devices."
-msgstr "To af de virtuelle diske har konfliktende virtuelle navne eller fysiske enheder."
+msgid ""
+"Two of the virtual disks have conflicting virtual names or physical devices."
+msgstr ""
+"To af de virtuelle diske har konfliktende virtuelle navne eller fysiske "
+"enheder."
#: src/vminstall/msg.py:100
msgid "Not enough space on device for disk image."
@@ -247,8 +262,12 @@
msgstr "Oprettelse af disk-imagefil mislykkedes."
#: src/vminstall/msg.py:102
-msgid "You are overcommitting the amount of disk space available on this device. Continue anyways?"
-msgstr "Du overforbruger den mængde af diskplads der er ledig på enheden. Vil du fortsætte alligevel?"
+msgid ""
+"You are overcommitting the amount of disk space available on this device. "
+"Continue anyways?"
+msgstr ""
+"Du overforbruger den mængde af diskplads der er ledig på enheden. Vil du "
+"fortsætte alligevel?"
#: src/vminstall/msg.py:105
msgid "The job was canceled."
@@ -343,10 +362,9 @@
msgstr "openSUSE 12"
#: src/vminstall/msg.py:134
-#, fuzzy
#| msgid "openSUSE 11"
msgid "openSUSE 13"
-msgstr "openSUSE 11"
+msgstr "openSUSE 13"
#: src/vminstall/msg.py:135
msgid "Other operating system"
@@ -662,31 +680,46 @@
msgstr "Værtsenheder"
#: src/vminstall/msg.py:221
-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 "Denne assistent vil guide dig gennem at oprette en ny virtuel maskine (VM). Du vil blive bedt om noget information om den VM du ønsker at oprette, såsom:"
+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 ""
+"Denne assistent vil guide dig gennem at oprette en ny virtuel maskine (VM). "
+"Du vil blive bedt om noget information om den VM du ønsker at oprette, såsom:"
#: src/vminstall/msg.py:222
msgid "The <b>type of operating system</b> that will run in the new VM"
msgstr "<b>Typen af operativsystem</b> som vil køre i den ny VM"
#: src/vminstall/msg.py:223
-msgid "Whether the VM will be <b>fully virtualized</b> or <b>paravirtualized</b>"
-msgstr "Hvorvidt VM'en vil blive <b>fuldt virtualiseret</b> eller <b>paravirtualiseret</b>"
+msgid ""
+"Whether the VM will be <b>fully virtualized</b> or <b>paravirtualized</b>"
+msgstr ""
+"Hvorvidt VM'en vil blive <b>fuldt virtualiseret</b> eller <b>"
+"paravirtualiseret</b>"
#: src/vminstall/msg.py:224
-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 "<b>Placering</b> af de nødvendige filer for at installere et operativsystem på VM'en eller en <b>disk</b> som allerede har et operativsystem"
+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 ""
+"<b>Placering</b> af de nødvendige filer for at installere et operativsystem "
+"på VM'en eller en <b>disk</b> som allerede har et operativsystem"
#: src/vminstall/msg.py:225
-msgid "Other characteristics of the VM, such as <b>memory</b>, <b>processors</b>, and <b>network adapters</b>."
-msgstr "Andre karakteristika ved VM'en, såsom <b>hukommelse</b>, <b>processorer</b> og <b>netværksenheder</b>."
+msgid ""
+"Other characteristics of the VM, such as <b>memory</b>, <b>processors</b>, "
+"and <b>network adapters</b>."
+msgstr ""
+"Andre karakteristika ved VM'en, såsom <b>hukommelse</b>, <b>processorer</b> "
+"og <b>netværksenheder</b>."
#. TRANSLATORS Do not translate %(url)s
#: src/vminstall/msg.py:227
-#, fuzzy
#| msgid "For the most current information on Novell VM server technology, see "
msgid "For the most current information on SUSE VM server technology, see "
-msgstr "For den mest aktuelle information om Novell VM-serverteknologi, se "
+msgstr "For den mest aktuelle information om SUSE VM-serverteknologi, se "
#: src/vminstall/msg.py:228
#, python-format
@@ -694,8 +727,14 @@
msgstr "%(url)s"
#: src/vminstall/msg.py:229
-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 "Hvis du opretter denne VM fra bunden vil du skulle installere et operativsystem. Når du migrerer en fysisk maskine til en virtuel maskine kan disken med det eksisterende operativsystem ofte genbruges til VM'en."
+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 ""
+"Hvis du opretter denne VM fra bunden vil du skulle installere et "
+"operativsystem. Når du migrerer en fysisk maskine til en virtuel maskine kan "
+"disken med det eksisterende operativsystem ofte genbruges til VM'en."
#: src/vminstall/msg.py:230
msgid "I need to install an operating system."
@@ -714,36 +753,78 @@
msgstr "Vælg venligst et navn til den virtuelle maskine."
#: src/vminstall/msg.py:234
-msgid "Click any headline to make changes. When the settings are correct, click <b>OK</b> to create the VM."
-msgstr "Klik på enhver overskrift for at foretage ændringer. Når indstillingerne er korrekte, klik <b>OK</b> for at oprette VM'en."
+msgid ""
+"Click any headline to make changes. When the settings are correct, click <b>"
+"OK</b> to create the VM."
+msgstr ""
+"Klik på enhver overskrift for at foretage ændringer. Når indstillingerne er "
+"korrekte, klik <b>OK</b> for at oprette VM'en."
#: src/vminstall/msg.py:235
-msgid "Virtual machines can use paravirtualization or full virtualization. Paravirtualization is faster but requires operating system support. Full virtualization runs a broader range of operating systems but requires hardware support. Which do you prefer?"
-msgstr "Virtuelle maskiner kan bruge paravirtualisering eller fuld virtualisering. Paravirtualisering er hurtigere men kræver understøttelse fra operativsystemet.. Fuld virtualisering kører et større antal operativsystemer men kræver hardware-understøttelse. Hvilken foretrækker du?"
+msgid ""
+"Virtual machines can use paravirtualization or full virtualization. "
+"Paravirtualization is faster but requires operating system support. Full "
+"virtualization runs a broader range of operating systems but requires "
+"hardware support. Which do you prefer?"
+msgstr ""
+"Virtuelle maskiner kan bruge paravirtualisering eller fuld virtualisering. "
+"Paravirtualisering er hurtigere men kræver understøttelse fra "
+"operativsystemet.. Fuld virtualisering kører et større antal operativsystemer "
+"men kræver hardware-understøttelse. Hvilken foretrækker du?"
#: src/vminstall/msg.py:236
-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 "Angiv venligst typen af operativsystem der vil køre i den virtuelle maskine. Dette definerer mange standardindstillinger, og hjælper med at afgøre hvordan paravirtualiserede operativsystemer skal startes."
+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 ""
+"Angiv venligst typen af operativsystem der vil køre i den virtuelle maskine. "
+"Dette definerer mange standardindstillinger, og hjælper med at afgøre hvordan "
+"paravirtualiserede operativsystemer skal startes."
#: src/vminstall/msg.py:237
-msgid "Some operating systems support automating the installation by specifying a URL or file(s). Select a directory to include multiple files."
-msgstr "Nogle operativsystemer understøtter automatisering af installationen ved at at angive en URL eller fil(er). Vælg en mappe for at inkludere flere filer."
+msgid ""
+"Some operating systems support automating the installation by specifying a "
+"URL or file(s). Select a directory to include multiple files."
+msgstr ""
+"Nogle operativsystemer understøtter automatisering af installationen ved at "
+"at angive en URL eller fil(er). Vælg en mappe for at inkludere flere filer."
#: src/vminstall/msg.py:239
-msgid "Some operating systems accept additional arguments, used to customize the installation or boot process."
-msgstr "Nogle operativsystemer accepterer yderligere argumenter, som bruges til at brugertilpasse installations- eller boot-processen."
+msgid ""
+"Some operating systems accept additional arguments, used to customize the "
+"installation or boot process."
+msgstr ""
+"Nogle operativsystemer accepterer yderligere argumenter, som bruges til at "
+"brugertilpasse installations- eller boot-processen."
#: src/vminstall/msg.py:240
-msgid "Select the behavior when the operating system exits with power off, reboot or crash. Settings take effect after installation is complete."
-msgstr "Vælg opførsel for når styresystemet afslutter med nedlukning, genstart eller sammenbrud. Indstillinger får virkning, efter installationen er gennemført."
+msgid ""
+"Select the behavior when the operating system exits with power off, reboot or "
+"crash. Settings take effect after installation is complete."
+msgstr ""
+"Vælg opførsel for når styresystemet afslutter med nedlukning, genstart eller "
+"sammenbrud. Indstillinger får virkning, efter installationen er gennemført."
#: src/vminstall/msg.py:243
-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 "Angiv den bootbare virtuelle disk (ofte markeret som Disk 1) eller URL til netværkssoftwarekilden. Hver cd, dvd, eller ISO-imagefil som kræves til installation skal tilføjes som en virtuel disk."
+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 ""
+"Angiv den bootbare virtuelle disk (ofte markeret som Disk 1) eller URL til "
+"netværkssoftwarekilden. Hver cd, dvd, eller ISO-imagefil som kræves til "
+"installation skal tilføjes som en virtuel disk."
#: src/vminstall/msg.py:246
-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 "Opret en virtuel disk baseret på en enhed (cd eller anden blokenhed), en eksisterende imagefil (ISO), eller en ny fil. Angiv en enhed ved dens enhedsknudepunkt, f.eks. /dev/cdcrom, ikke dens monteringspunkt."
+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 ""
+"Opret en virtuel disk baseret på en enhed (cd eller anden blokenhed), en "
+"eksisterende imagefil (ISO), eller en ny fil. Angiv en enhed ved dens "
+"enhedsknudepunkt, f.eks. /dev/cdcrom, ikke dens monteringspunkt."
#: src/vminstall/msg.py:247
msgid "Please specify the settings for the virtual network adapter."
@@ -754,32 +835,61 @@
msgstr "Tryk \"q\" eller Esc-tasten for at afslutte."
#: src/vminstall/msg.py:249
-msgid "Warning: Vm-install automatically manages these configuration settings depending on the operating system to be installed. It is expected that you understand clearly the consequences of enabling or disabling a particular setting."
-msgstr "Advarsel: Vm-install håndterer automatisk disse konfigurationsindstillinger afhængigt af operativsystemet der skal installeres. Det forventes at du fuldt ud forstår konsekvenserne af at aktivere eller deaktivere en bestemt indstilling."
+msgid ""
+"Warning: Vm-install automatically manages these configuration settings "
+"depending on the operating system to be installed. It is expected that you "
+"understand clearly the consequences of enabling or disabling a particular "
+"setting."
+msgstr ""
+"Advarsel: Vm-install håndterer automatisk disse konfigurationsindstillinger "
+"afhængigt af operativsystemet der skal installeres. Det forventes at du fuldt "
+"ud forstår konsekvenserne af at aktivere eller deaktivere en bestemt "
+"indstilling."
#: src/vminstall/msg.py:250
msgid "Reset to Defaults"
msgstr "Nulstil til standardindstillinger"
#: src/vminstall/msg.py:251
-msgid "Setting the maximum memory greater than the initial memory requires the VM operating system to have a memory balloon driver."
-msgstr "At sætte den maksimale hukommelse højere end den indledningsvise hukommelse kræver at VM-styresystemet har en \"memory balloon\"-driver."
+msgid ""
+"Setting the maximum memory greater than the initial memory requires the VM "
+"operating system to have a memory balloon driver."
+msgstr ""
+"At sætte den maksimale hukommelse højere end den indledningsvise hukommelse "
+"kræver at VM-styresystemet har en \"memory balloon\"-driver."
#: src/vminstall/msg.py:254
-msgid "Specify the amount of memory and number of processors to allocate for the VM."
-msgstr "Angiv mængden af hukommelse og antallet af processorer der skal allokeres til VM'en."
+msgid ""
+"Specify the amount of memory and number of processors to allocate for the VM."
+msgstr ""
+"Angiv mængden af hukommelse og antallet af processorer der skal allokeres til "
+"VM'en."
#: src/vminstall/msg.py:255
-msgid "For best performance, the number of virtual processors should be less than or equal to the number of physical processors."
-msgstr "For bedst ydelse, skal antallet af virtuelle processorer være mindre end eller lig med antallet af fysiske processorer."
+msgid ""
+"For best performance, the number of virtual processors should be less than or "
+"equal to the number of physical processors."
+msgstr ""
+"For bedst ydelse, skal antallet af virtuelle processorer være mindre end "
+"eller lig med antallet af fysiske processorer."
#: src/vminstall/msg.py:258
-msgid "Paravirtualized graphics require that an appropriate driver is installed in the operating system."
-msgstr "Paravirtualiseret grafik kræver at en passende driver er installeret i operativsystemet."
+msgid ""
+"Paravirtualized graphics require that an appropriate driver is installed in "
+"the operating system."
+msgstr ""
+"Paravirtualiseret grafik kræver at en passende driver er installeret i "
+"operativsystemet."
#: src/vminstall/msg.py:259
-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 "VM'en vil operere som en server uden en monitor. Du kan tilgå operativsystemet via den virtualiserede serial-port, eller gennem tjenester understøttet af operativsystemet såsom ssh eller VNC. "
+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 ""
+"VM'en vil operere som en server uden en monitor. Du kan tilgå "
+"operativsystemet via den virtualiserede serial-port, eller gennem tjenester "
+"understøttet af operativsystemet såsom ssh eller VNC. "
#: src/vminstall/msg.py:260
msgid "Please specify the type of virtualized graphics hardware."
@@ -846,8 +956,12 @@
msgstr "Lydkort"
#: src/vminstall/msg.py:282
-msgid "Specify a host device for the VM. This will give the VM direct access to the device."
-msgstr "Angiv en værtsenhed til VM'en. Dette vil give VM'en direkte adgang til enheden."
+msgid ""
+"Specify a host device for the VM. This will give the VM direct access to the "
+"device."
+msgstr ""
+"Angiv en værtsenhed til VM'en. Dette vil give VM'en direkte adgang til "
+"enheden."
#: src/vminstall/msg.py:283
msgid "Host devices cannot be shared between VMs or between a VM and the host."
@@ -870,8 +984,12 @@
msgstr "USB-værtsenheder"
#: src/vminstall/msg.py:288
-msgid "Do not add a PCI or USB device to this VM that is needed by the host to function properly."
-msgstr "Føj ikke en PCI- eller USB-enhed til denne VM, som kræves for at værten kan fungere ordentligt."
+msgid ""
+"Do not add a PCI or USB device to this VM that is needed by the host to "
+"function properly."
+msgstr ""
+"Føj ikke en PCI- eller USB-enhed til denne VM, som kræves for at værten kan "
+"fungere ordentligt."
#: src/vminstall/msg.py:292
msgid "Virtual Disks"
@@ -918,8 +1036,12 @@
msgstr "Cache-tilstand"
#: src/vminstall/msg.py:305
-msgid "Can't reach the pxe server. Possible reasons are an improperly configured network or firewall restrictions."
-msgstr "Kan ikke nå pxe-serveren. Mulige årsager er et ukorrekt konfigureret netværk eller firewall-restriktioner."
+msgid ""
+"Can't reach the pxe server. Possible reasons are an improperly configured "
+"network or firewall restrictions."
+msgstr ""
+"Kan ikke nå pxe-serveren. Mulige årsager er et ukorrekt konfigureret netværk "
+"eller firewall-restriktioner."
#: src/vminstall/msg.py:306
msgid "Can't get the pxelinux.cfg/default file from the pxe server."
@@ -930,16 +1052,24 @@
msgstr "Kan ikke downloade kernen og initrd fra serveren."
#: src/vminstall/msg.py:308
-msgid "This kernel image may not be a paravirtualized xen kernel required for installation, Continue?"
-msgstr "Denne kerne-imagefil er måske ikke en paravirtualiseret xen-kerne, som kræves for installation. Vil du fortsætte?"
+msgid ""
+"This kernel image may not be a paravirtualized xen kernel required for "
+"installation, Continue?"
+msgstr ""
+"Denne kerne-imagefil er måske ikke en paravirtualiseret xen-kerne, som kræves "
+"for installation. Vil du fortsætte?"
#: src/vminstall/msg.py:309
msgid "Unable to identify a configured network bridge."
msgstr "Kan ikke identificere en konfigureret netværksbro."
#: src/vminstall/msg.py:310
-msgid "Paravirtualized PXE booting requires the use of tftp or atftp. Please install one of these packages."
-msgstr "Paravirtualiseret PXE-boot kræver brug af tftp eller atftp. Installér en af de pakker."
+msgid ""
+"Paravirtualized PXE booting requires the use of tftp or atftp. Please "
+"install one of these packages."
+msgstr ""
+"Paravirtualiseret PXE-boot kræver brug af tftp eller atftp. Installér en af "
+"de pakker."
#: src/vminstall/msg.py:313
msgid "Fully Virtualized Intel e100"
@@ -1121,8 +1251,12 @@
msgstr "Angiv den URL som indeholder kilden til netværksinstallation."
#: src/vminstall/msg.py:377
-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."
-msgstr "Ingen hypervisor kører. For kvm, indlæs kvm-kernemodulerne. Hvis du vil køre xen, så genstart og indlæs xen-kernen."
+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."
+msgstr ""
+"Ingen hypervisor kører. For kvm, indlæs kvm-kernemodulerne. Hvis du vil køre "
+"xen, så genstart og indlæs xen-kernen."
#~ msgid "Graphics and Keyboard"
#~ msgstr "Grafik og tastatur"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.7.6/po/fr.po new/vm-install-0.7.8/po/fr.po
--- old/vm-install-0.7.6/po/fr.po 2013-08-15 00:01:07.000000000 +0200
+++ new/vm-install-0.7.8/po/fr.po 2013-10-02 23:51:21.000000000 +0200
@@ -5,7 +5,7 @@
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-08-01 09:23-0600\n"
-"PO-Revision-Date: 2013-02-07 19:50+0100\n"
+"PO-Revision-Date: 2013-09-18 18:23+0100\n"
"Last-Translator: Jean-Marc BOUCHE \n"
"Language-Team: French \n"
"Language: fr\n"
@@ -13,7 +13,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Poedit 1.5.4\n"
#: src/vminstall/msg.py:22
msgid "Installation Error"
@@ -394,7 +394,7 @@
#: src/vminstall/msg.py:134
msgid "openSUSE 13"
-msgstr ""
+msgstr "openSUSE 13"
#: src/vminstall/msg.py:135
msgid "Other operating system"
@@ -761,8 +761,10 @@
#. TRANSLATORS Do not translate %(url)s
#: src/vminstall/msg.py:227
+#, fuzzy
msgid "For the most current information on SUSE VM server technology, see "
msgstr ""
+"Pour des informations plus récentes sur la technologie SUSE VM server, voir"
#: src/vminstall/msg.py:228
#, python-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.7.6/po/pl.po new/vm-install-0.7.8/po/pl.po
--- old/vm-install-0.7.6/po/pl.po 2013-08-15 00:01:08.000000000 +0200
+++ new/vm-install-0.7.8/po/pl.po 2013-10-02 23:51:36.000000000 +0200
@@ -8,9 +8,9 @@
"Project-Id-Version: xen-vm-install\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-08-01 09:23-0600\n"
-"PO-Revision-Date: 2013-01-04 20:58+0100\n"
+"PO-Revision-Date: 2013-09-15 21:01+0200\n"
"Last-Translator: Krzysztof Magda \n"
-"Language-Team: Polish \n"
+"Language-Team: Polish \n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -344,9 +344,8 @@
msgstr "openSUSE 12"
#: src/vminstall/msg.py:134
-#, fuzzy
msgid "openSUSE 13"
-msgstr "openSUSE 11"
+msgstr "openSUSE 13"
#: src/vminstall/msg.py:135
msgid "Other operating system"
@@ -682,9 +681,8 @@
#. TRANSLATORS Do not translate %(url)s
#: src/vminstall/msg.py:227
-#, fuzzy
msgid "For the most current information on SUSE VM server technology, see "
-msgstr "Najnowsze informacje na temat technologii serwera komputerów wirtualnych firmy Novell dostępne są pod adresem "
+msgstr "Najnowsze informacje dotyczące technologii serwera maszyn wirtualnych SUSE dostępne są pod adresem "
#: src/vminstall/msg.py:228
#, python-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.7.6/po/zh_CN.po new/vm-install-0.7.8/po/zh_CN.po
--- old/vm-install-0.7.6/po/zh_CN.po 2013-09-12 14:38:08.000000000 +0200
+++ new/vm-install-0.7.8/po/zh_CN.po 2013-10-02 23:51:38.000000000 +0200
@@ -4,13 +4,14 @@
# This file is distributed under the same license as @PACKAGE@ package. FIRST
#
# Eric Shan , 2008, 2012.
+# 玛格丽特 · 苏 , 2013.
msgid ""
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-08-01 09:23-0600\n"
-"PO-Revision-Date: 2012-11-01 01:30+0800\n"
-"Last-Translator: \n"
+"PO-Revision-Date: 2013-09-23 15:30+0800\n"
+"Last-Translator: 玛格丽特 · 苏 \n"
"Language-Team: Chinese Simplified \n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
@@ -37,7 +38,7 @@
#: src/vminstall/msg.py:26
msgid "Invalid URL"
-msgstr "无效网址"
+msgstr "无效 URL"
#: src/vminstall/msg.py:27
msgid "The 'kernel-xen' and 'install-initrd' packages were not found."
@@ -47,7 +48,7 @@
#: src/vminstall/msg.py:29
#, python-format
msgid "Failed to find the '%(tag)s' tag in the XML file."
-msgstr "未在 XML 文件中找到 '%(tag)s' 标记。"
+msgstr "未在 XML 文件中找到 '%(tag)s' 标签。"
#. TRANSLATORS Do not translate %(file)s
#: src/vminstall/msg.py:31
@@ -57,7 +58,7 @@
#: src/vminstall/msg.py:32
msgid "The virtual disk may only be stored on a block device or in a file."
-msgstr "虚拟磁盘只能存储在块设备或文件上。"
+msgstr "虚拟磁盘只能存储在块设备上或文件中。"
#: src/vminstall/msg.py:33
msgid "No media is present in the drive."
@@ -73,7 +74,7 @@
#: src/vminstall/msg.py:38
msgid "Please type a number."
-msgstr "请输入数字。"
+msgstr "请输入一个数字。"
#. TRANSLATORS Do not translate %(val)s
#: src/vminstall/msg.py:40
@@ -89,19 +90,21 @@
#: src/vminstall/msg.py:45
msgid "The VM's name must contain only alphanumeric and _ - . : + characters."
-msgstr "虚拟机的名称只能包含字母数字和 _ - :+ 字符。"
+msgstr "虚拟机名称只能包含字母数字和 _ -. :+ 字符。"
#: src/vminstall/msg.py:46
msgid "The VM's name must contain from 1 to 255 characters."
-msgstr "虚拟机的名称可包含 1 到 255 个字符。"
+msgstr "虚拟机名称可包含 1 到 255 个字符。"
#: src/vminstall/msg.py:47
msgid "The VM's name cannot start with a digit."
-msgstr "虚拟机的名称不能以数字开头。"
+msgstr "虚拟机名称不能以小数点开头。"
#: src/vminstall/msg.py:50
#, python-format
-msgid "Failed to display the VM's console because DISPLAY is not set. Please connect a VNC viewer to %s:%d."
+msgid ""
+"Failed to display the VM's console because DISPLAY is not set. Please "
+"connect a VNC viewer to %s:%d."
msgstr "由于未设置 DISPLAY,所以未能显示虚拟机控制台。请将 VNC 查看器连接到 %s:%d。"
#: src/vminstall/msg.py:51
@@ -185,7 +188,9 @@
msgstr "读取配置文件时出错。"
#: src/vminstall/msg.py:80
-msgid "The operating system is incompatible with the processor architecture of this machine."
+msgid ""
+"The operating system is incompatible with the processor architecture of this "
+"machine."
msgstr "操作系统与此计算机的处理器体系结构不兼容。"
#: src/vminstall/msg.py:81
@@ -193,7 +198,9 @@
msgstr "此计算机中的处理器不支持全虚拟化。"
#: src/vminstall/msg.py:82
-msgid "The processor(s) in this machine support full virtualization, but it is disabled in the BIOS."
+msgid ""
+"The processor(s) in this machine support full virtualization, but it is "
+"disabled in the BIOS."
msgstr "此计算机中的处理器支持完全虚拟化,但 BIOS 禁用了全虚拟化。"
#: src/vminstall/msg.py:85
@@ -237,7 +244,8 @@
msgstr "尝试访问磁盘时,权限被拒绝。"
#: src/vminstall/msg.py:99
-msgid "Two of the virtual disks have conflicting virtual names or physical devices."
+msgid ""
+"Two of the virtual disks have conflicting virtual names or physical devices."
msgstr "其中两个虚拟磁盘具有相冲突的虚拟名称或物理设备。"
#: src/vminstall/msg.py:100
@@ -249,7 +257,9 @@
msgstr "创建磁盘映像失败。"
#: src/vminstall/msg.py:102
-msgid "You are overcommitting the amount of disk space available on this device. Continue anyways?"
+msgid ""
+"You are overcommitting the amount of disk space available on this device. "
+"Continue anyways?"
msgstr "您使用的磁盘空间超过了本设备上可用的磁盘空间。依然继续吗?"
#: src/vminstall/msg.py:105
@@ -345,10 +355,9 @@
msgstr "openSUSE 12"
#: src/vminstall/msg.py:134
-#, fuzzy
#| msgid "openSUSE 11"
msgid "openSUSE 13"
-msgstr "openSUSE 11"
+msgstr "openSUSE 13"
#: src/vminstall/msg.py:135
msgid "Other operating system"
@@ -664,7 +673,10 @@
msgstr "主机设备"
#: src/vminstall/msg.py:221
-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:"
+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 "此助手将引导用户完成新虚拟机 (VM) 的创建。将向您询问一些要创建的虚拟机相关信息,比如:"
#: src/vminstall/msg.py:222
@@ -672,23 +684,27 @@
msgstr "将在新虚拟机中运行的<b>操作系统类型</b>"
#: src/vminstall/msg.py:223
-msgid "Whether the VM will be <b>fully virtualized</b> or <b>paravirtualized</b>"
+msgid ""
+"Whether the VM will be <b>fully virtualized</b> or <b>paravirtualized</b>"
msgstr "要创建<b>全虚拟化</b>还是<b>超虚拟化</b>的虚拟机"
#: src/vminstall/msg.py:224
-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"
+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 "在虚拟机上安装操作系统所必需的文件或已经具有操作系统的<b>磁盘</b>的<b>位置</b>"
#: src/vminstall/msg.py:225
-msgid "Other characteristics of the VM, such as <b>memory</b>, <b>processors</b>, and <b>network adapters</b>."
+msgid ""
+"Other characteristics of the VM, such as <b>memory</b>, <b>processors</b>, "
+"and <b>network adapters</b>."
msgstr "虚拟机的其它特征,比如 <b>内存</b>、<b>处理器</b>和<b>网络适配器</b>。"
#. TRANSLATORS Do not translate %(url)s
#: src/vminstall/msg.py:227
-#, fuzzy
#| msgid "For the most current information on Novell VM server technology, see "
msgid "For the most current information on SUSE VM server technology, see "
-msgstr "关于 Novell 虚拟机服务器技术的最新信息,请参阅 "
+msgstr "SUSE 虚拟机服务器技术的最新信息,请参阅"
#: src/vminstall/msg.py:228
#, python-format
@@ -696,7 +712,10 @@
msgstr "%(url)s"
#: src/vminstall/msg.py:229
-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."
+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:230
@@ -716,36 +735,60 @@
msgstr "请为虚拟机选择一个名称。"
#: src/vminstall/msg.py:234
-msgid "Click any headline to make changes. When the settings are correct, click <b>OK</b> to create the VM."
+msgid ""
+"Click any headline to make changes. When the settings are correct, click <b>"
+"OK</b> to create the VM."
msgstr "请单击任意标题,以做出修改。如果设置正确,请单击<b>确定</b>创建虚拟机。"
#: src/vminstall/msg.py:235
-msgid "Virtual machines can use paravirtualization or full virtualization. Paravirtualization is faster but requires operating system support. Full virtualization runs a broader range of operating systems but requires hardware support. Which do you prefer?"
-msgstr "虚拟机可使用超虚拟化或全虚拟化。超虚拟化更快,但要求有操作系统的支持。全虚拟化可运行范围更广泛的操作系统,但要求有硬件支持。要选择哪种虚拟化?"
+msgid ""
+"Virtual machines can use paravirtualization or full virtualization. "
+"Paravirtualization is faster but requires operating system support. Full "
+"virtualization runs a broader range of operating systems but requires "
+"hardware support. Which do you prefer?"
+msgstr ""
+"虚拟机可使用超虚拟化或全虚拟化。超虚拟化更快,但要求有操作系统的支持。全虚拟化可运行范围更广泛的操作系统,但要求有硬件支持。要选择哪种虚拟化?"
#: src/vminstall/msg.py:236
-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."
+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:237
-msgid "Some operating systems support automating the installation by specifying a URL or file(s). Select a directory to include multiple files."
+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:239
-msgid "Some operating systems accept additional arguments, used to customize the installation or boot process."
+msgid ""
+"Some operating systems accept additional arguments, used to customize the "
+"installation or boot process."
msgstr "有些操作系统还接受额外参数,用于自定义安装或引导进程。"
#: src/vminstall/msg.py:240
-msgid "Select the behavior when the operating system exits with power off, reboot or crash. Settings take effect after installation is complete."
+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:243
-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."
+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 "指定可引导的虚拟磁盘(标签经常为 Disk 1)或网络安装来源网址。安装所需的每张 CD、DVD 或 ISO 映像必须被添加为虚拟磁盘。"
#: src/vminstall/msg.py:246
-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 "基于一个设备(CD 或者其他块设备)、已有映像文件(ISO)或者新文件,创建一个虚拟磁盘。使用设备节点指定设备,比如 /dev/cdrom,不要使用它的挂载点指定。"
+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 ""
+"基于一个设备(CD 或者其他块设备)、已有映像文件(ISO)或者新文件,创建一个虚拟磁盘。使用设备节点指定设备,比如 "
+"/dev/cdrom,不要使用它的挂载点指定。"
#: src/vminstall/msg.py:247
msgid "Please specify the settings for the virtual network adapter."
@@ -756,7 +799,11 @@
msgstr "按 'q' 或 Esc 键退出。"
#: src/vminstall/msg.py:249
-msgid "Warning: Vm-install automatically manages these configuration settings depending on the operating system to be installed. It is expected that you understand clearly the consequences of enabling or disabling a particular setting."
+msgid ""
+"Warning: Vm-install automatically manages these configuration settings "
+"depending on the operating system to be installed. It is expected that you "
+"understand clearly the consequences of enabling or disabling a particular "
+"setting."
msgstr "警告:根据将安装的操作系统类型,Vm-install 会自动管理这些配置设置。 希望您能清楚的知道启用或禁用某项设置的后果。"
#: src/vminstall/msg.py:250
@@ -764,23 +811,33 @@
msgstr "重置为默认"
#: src/vminstall/msg.py:251
-msgid "Setting the maximum memory greater than the initial memory requires the VM operating system to have a memory balloon driver."
+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:254
-msgid "Specify the amount of memory and number of processors to allocate for the VM."
+msgid ""
+"Specify the amount of memory and number of processors to allocate for the VM."
msgstr "请指定为虚拟机分配的内存量和处理器数量。"
#: src/vminstall/msg.py:255
-msgid "For best performance, the number of virtual processors should be less than or equal to the number of physical processors."
+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:258
-msgid "Paravirtualized graphics require that an appropriate driver is installed in the operating system."
+msgid ""
+"Paravirtualized graphics require that an appropriate driver is installed in "
+"the operating system."
msgstr "超虚拟化图形要求操作系统中安装有合适的驱动程序。"
#: src/vminstall/msg.py:259
-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."
+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 "虚拟机将像没有监视器的服务器一样运行。您仍然可以通过虚拟串行端口或通过任何操作系统支持的服务(比如 ssh 或 VNC)来访问操作系统。"
#: src/vminstall/msg.py:260
@@ -848,7 +905,9 @@
msgstr "声卡"
#: src/vminstall/msg.py:282
-msgid "Specify a host device for the VM. This will give the VM direct access to the device."
+msgid ""
+"Specify a host device for the VM. This will give the VM direct access to the "
+"device."
msgstr "为虚拟机指定一个主机设备。这将给虚拟机这台设备的直接访问权限。"
#: src/vminstall/msg.py:283
@@ -872,7 +931,9 @@
msgstr "USB 主机设备"
#: src/vminstall/msg.py:288
-msgid "Do not add a PCI or USB device to this VM that is needed by the host to function properly."
+msgid ""
+"Do not add a PCI or USB device to this VM that is needed by the host to "
+"function properly."
msgstr "不要添加主机正常运行所需的 PCI 或 USB 设备给此虚拟机。"
#: src/vminstall/msg.py:292
@@ -921,7 +982,9 @@
msgstr "缓存模式"
#: src/vminstall/msg.py:305
-msgid "Can't reach the pxe server. Possible reasons are an improperly configured network or firewall restrictions."
+msgid ""
+"Can't reach the pxe server. Possible reasons are an improperly configured "
+"network or firewall restrictions."
msgstr "不能连接 pxe 服务器。可能有不当配置的网络或防火墙限制。"
#: src/vminstall/msg.py:306
@@ -933,7 +996,9 @@
msgstr "无法从服务器下载内核和 initrd 。"
#: src/vminstall/msg.py:308
-msgid "This kernel image may not be a paravirtualized xen kernel required for installation, Continue?"
+msgid ""
+"This kernel image may not be a paravirtualized xen kernel required for "
+"installation, Continue?"
msgstr "内核映像不是安装需要的超虚拟化的 xen 内核,依然继续?"
#: src/vminstall/msg.py:309
@@ -941,7 +1006,9 @@
msgstr "无法识别配置的网桥。"
#: src/vminstall/msg.py:310
-msgid "Paravirtualized PXE booting requires the use of tftp or atftp. Please install one of these packages."
+msgid ""
+"Paravirtualized PXE booting requires the use of tftp or atftp. Please "
+"install one of these packages."
msgstr "超虚拟化 PXE 启动需要使用 tftp 或 atftp。请安装任意一个软件包。"
#: src/vminstall/msg.py:313
@@ -1124,7 +1191,9 @@
msgstr "指定包含网络安装来源的网址。"
#: src/vminstall/msg.py:377
-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."
+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."
msgstr "没有正在运行的虚拟机。KVM 请加载 kvm 内核模块。如果您想运行 xen,请重启并加载 xen 内核。"
#, fuzzy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.7.6/setup.py new/vm-install-0.7.8/setup.py
--- old/vm-install-0.7.6/setup.py 2013-09-06 17:14:50.000000000 +0200
+++ new/vm-install-0.7.8/setup.py 2013-10-02 23:53:35.000000000 +0200
@@ -1,7 +1,7 @@
from distutils.core import setup
setup(name='vminstall',
- version='0.7.6',
+ version='0.7.8',
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.7.6/src/vminstall/hypervisor.py new/vm-install-0.7.8/src/vminstall/hypervisor.py
--- old/vm-install-0.7.6/src/vminstall/hypervisor.py 2012-10-04 23:51:44.000000000 +0200
+++ new/vm-install-0.7.8/src/vminstall/hypervisor.py 2013-09-19 19:42:12.000000000 +0200
@@ -81,6 +81,13 @@
#---------------------------------------------------------------------------
+ # Method: reset_connection
+ #---------------------------------------------------------------------------
+ def reset_connection(self, hypervisor):
+ return None
+
+
+ #---------------------------------------------------------------------------
# Method: get_dom0_min_memory
#
# This method is stubb so that individual hypervisor logic can define their own.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.7.6/src/vminstall/kvm_guest.py new/vm-install-0.7.8/src/vminstall/kvm_guest.py
--- old/vm-install-0.7.6/src/vminstall/kvm_guest.py 2013-05-30 22:03:11.000000000 +0200
+++ new/vm-install-0.7.8/src/vminstall/kvm_guest.py 2013-09-19 19:42:12.000000000 +0200
@@ -294,7 +294,7 @@
virDom = hypervisor.connection.getconn().defineXML(domXML)
except:
# Retry with a new connection should the defineXML call fail
- hypervisor.connection = libvirt_hypervisor.LibVirtHypervisor("qemu:///system")
+ virConn = hypervisor.connection.reset_connection()
virDom = hypervisor.connection.getconn().defineXML(domXML)
virDom.create()
except RuntimeError, e:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.7.6/src/vminstall/libvirt_console.py new/vm-install-0.7.8/src/vminstall/libvirt_console.py
--- old/vm-install-0.7.6/src/vminstall/libvirt_console.py 2012-10-04 23:53:44.000000000 +0200
+++ new/vm-install-0.7.8/src/vminstall/libvirt_console.py 2013-09-19 19:42:12.000000000 +0200
@@ -42,7 +42,12 @@
def get_domid_from_uuid(self, uuid):
virConn = vminstall.hypervisor.connection.getconn()
if virConn:
- virDom = virConn.lookupByUUIDString(uuid)
+ virDom = None
+ try:
+ virDom = virConn.lookupByUUIDString(uuid)
+ except:
+ virConn = vminstall.hypervisor.connection.reset_connection()
+ virDom = virConn.lookupByUUIDString(uuid)
if virDom:
domid = virDom.ID()
log.debug("Domain %s has ID %d" % (uuid, domid))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.7.6/src/vminstall/libvirt_hypervisor.py new/vm-install-0.7.8/src/vminstall/libvirt_hypervisor.py
--- old/vm-install-0.7.6/src/vminstall/libvirt_hypervisor.py 2012-10-04 23:53:52.000000000 +0200
+++ new/vm-install-0.7.8/src/vminstall/libvirt_hypervisor.py 2013-09-19 19:42:12.000000000 +0200
@@ -21,6 +21,7 @@
import time
import dbus
import os
+import hypervisor
#---------------------------------------------------------------------------
# Method: libvirt_error_handler
@@ -146,6 +147,17 @@
return self.virConn
+ #---------------------------------------------------------------------------
+ # Method: reset_connection
+ #---------------------------------------------------------------------------
+ def reset_connection(self):
+ if self.virConn is not None:
+ self.virConn.close()
+ self.virConn = None
+ hypervisor.connection = LibVirtHypervisor("qemu:///system")
+ return self.virConn
+
+
#---------------------------------------------------------------------------
# Method: get_dom0_min_memory
#---------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.7.6/src/vminstall/options.py new/vm-install-0.7.8/src/vminstall/options.py
--- old/vm-install-0.7.6/src/vminstall/options.py 2013-07-10 17:38:51.000000000 +0200
+++ new/vm-install-0.7.8/src/vminstall/options.py 2013-09-13 20:58:35.000000000 +0200
@@ -357,7 +357,8 @@
try:
hypervisor_info = hypervisor.connection.info()
except:
- max_allowed = VMDefaults[options.os_type].max_memory()
+ if options.os_type != 'pxe':
+ max_allowed = VMDefaults[options.os_type].max_memory()
return (init_allowed, max_allowed)
if options.full_virt:
free_mem = hypervisor_info['max_hvm_memory']
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org