Hello community,
here is the log from the commit of package vm-install for openSUSE:Factory
checked in at Mon Aug 17 15:29:30 CEST 2009.
--------
--- vm-install/vm-install.changes 2009-08-03 17:14:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/vm-install/vm-install.changes 2009-08-14 21:19:49.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Aug 12 15:02:43 MDT 2009 - carnold@novell.com
+
+- bnc#530246 - vm-install cannot add operating system which is
+ installed on disk
+
+-------------------------------------------------------------------
+Mon Aug 3 16:32:37 MDT 2009 - carnold@novell.com
+
+- Add support for KVM disk protocols.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
vm-install-0.4.6.tar.bz2
New:
----
vm-install-0.4.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vm-install.spec ++++++
--- /var/tmp/diff_new_pack.GMpNc7/_old 2009-08-17 15:28:51.000000000 +0200
+++ /var/tmp/diff_new_pack.GMpNc7/_new 2009-08-17 15:28:51.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package vm-install (Version 0.4.6)
+# spec file for package vm-install (Version 0.4.7)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -26,10 +26,10 @@
License: GPL v2 or later
Group: System/Emulators/PC
AutoReqProv: yes
-Version: 0.4.6
+Version: 0.4.7
Release: 1
Summary: Tool to Define a Virtual Machine and Install Its Operating System
-Source0: %{name}-0.4.6.tar.bz2
+Source0: %{name}-0.4.7.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
Requires: xen-tools python-urlgrabber libxml2-python libvirt-python udhcp tftp
++++++ vm-install-0.4.6.tar.bz2 -> vm-install-0.4.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.6/Makefile new/vm-install-0.4.7/Makefile
--- old/vm-install-0.4.6/Makefile 2009-07-29 00:20:42.000000000 +0200
+++ new/vm-install-0.4.7/Makefile 2009-08-04 00:33:17.000000000 +0200
@@ -1,5 +1,5 @@
PACKAGE = vm-install
-VER = 0.4.6
+VER = 0.4.7
default:
@echo "Run 'make install DESTDIR=$destdir' to install."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.6/po/fi.po new/vm-install-0.4.7/po/fi.po
--- old/vm-install-0.4.6/po/fi.po 2009-07-28 22:54:10.000000000 +0200
+++ new/vm-install-0.4.7/po/fi.po 2009-08-04 00:28:23.000000000 +0200
@@ -9,8 +9,8 @@
"Project-Id-Version: xen-vm-install.fi\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-08-22 09:29-0600\n"
-"PO-Revision-Date: 2009-06-28 18:28+0300\n"
-"Last-Translator: Jami Saarikoski \n"
+"PO-Revision-Date: 2009-07-18 23:58+0300\n"
+"Last-Translator: Jyri Palokangas \n"
"Language-Team: suomi \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -849,5 +849,5 @@
#: src/vminstall/msg.py:290
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 ""
+msgstr "Hypervisor ei ole käynnissä. Käyttääksesi kvm:ää, lataa kvm ydinmoduulit. Jos haluat käyttää xen:iä, uudelleen käynnistä kone xen ytimellä."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.6/po/it.po new/vm-install-0.4.7/po/it.po
--- old/vm-install-0.4.6/po/it.po 2009-07-28 22:54:10.000000000 +0200
+++ new/vm-install-0.4.7/po/it.po 2009-08-04 00:28:23.000000000 +0200
@@ -1,13 +1,14 @@
-# translation of xen-vm-install.po to italian
+# translation of xen-vm-install.po to italiano
# Andrea Florio , 2009.
+# Stefano Luciani , 2009.
msgid ""
msgstr ""
"Project-Id-Version: xen-vm-install\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-08-22 09:29-0600\n"
-"PO-Revision-Date: 2009-01-13 11:52+0100\n"
+"PO-Revision-Date: 2009-08-02 16:47+0200\n"
"Last-Translator: Andrea Florio \n"
-"Language-Team: italian \n"
+"Language-Team: italiano \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -340,16 +341,14 @@
msgstr "Windows NT"
#: src/vminstall/msg.py:132
-#, fuzzy
#| msgid "Windows Vista"
msgid "Windows Vista, Windows 7"
-msgstr "Windows Vista"
+msgstr "Windows Vista, Windows 7"
#: src/vminstall/msg.py:133
-#, fuzzy
#| msgid "Windows Vista (x64)"
msgid "Windows Vista, Windows 7 (x64)"
-msgstr "Windows Vista (x64)"
+msgstr "Windows Vista, Windows 7 (x64)"
#: src/vminstall/msg.py:134
msgid "Windows Server 2008"
@@ -449,7 +448,6 @@
msgstr "Nessuno"
#: src/vminstall/msg.py:162
-#, fuzzy
#| msgid "Username: "
msgid "Username:"
msgstr "Nome utente:"
@@ -563,6 +561,7 @@
msgstr "Fare clic su un titolo qualsiasi per apportare le modifiche. Se le impostazioni sono corrette, fare clic su <b>OK</b> per creare la VM."
#: src/vminstall/msg.py:194
+#, fuzzy
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 "Le VM possono utilizzare la paravirtualizzazione o la virtualizzazione completa. La paravirtualizzazione è più veloce ma deve essere supportata dal sistema operativo. La virtualizzazione completa è supportata da molti sistemi operativi ma deve essere compatibile anche con i componenti hardware. Selezionare il sistema di virtualizzazione desiderato."
@@ -596,7 +595,7 @@
#: src/vminstall/msg.py:206
msgid "Press 'q' or the Escape key to exit."
-msgstr ""
+msgstr "Premere 'q' o il tasto Esci per uscire."
#: src/vminstall/msg.py:209
msgid "Specify the amount of memory and number of processors to allocate for the VM."
@@ -672,10 +671,9 @@
msgstr "PXE"
#: src/vminstall/msg.py:234
-#, fuzzy
#| msgid "Can't reach the pxe server. Possible reasons are an improperly configured network, SuSEfirewall2 or iptables -L"
msgid "Can't reach the pxe server. Possible reasons are an improperly configured network or firewall restrictions."
-msgstr "Impossibile raggiungere il server pxe. Possibili motivi sono una configurazione errata della rete, SuSEfirewall2 o iptables -L"
+msgstr "Impossibile raggiungere il server pxe. Possibili motivi sono una configurazione errata della rete o restrizioni del firewall."
#: src/vminstall/msg.py:235
msgid "Can't get the pxelinux.cfg/default file from the pxe server."
@@ -805,7 +803,7 @@
#: src/vminstall/msg.py:274
msgid "Creating the Virtual Machine"
-msgstr "Configurazione in corso della VM..."
+msgstr "Configurazione della Mchhina Virtuale in corso..."
#: src/vminstall/msg.py:275
msgid "Writing the configuration file"
@@ -829,14 +827,17 @@
msgstr "Aggiungere un'altra scheda di rete virtuale?"
#: src/vminstall/msg.py:282
+#, fuzzy
msgid "What type of virtual disk do you want to add?"
msgstr "Specificare il tipo di disco virtuale che si desidera aggiungere"
#: src/vminstall/msg.py:283
+#, fuzzy
msgid "Where will the virtual disk physically reside?"
msgstr "Specificare l'ubicazione in cui dovrà risiedere fisicamente il disco virtuale."
#: src/vminstall/msg.py:284
+#, fuzzy
msgid "What type of virtual network adapter do you want to add?"
msgstr "Specificare il tipo di scheda di rete virtuale che si desidera aggiungere."
@@ -851,4 +852,5 @@
#: src/vminstall/msg.py:290
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 ""
+msgstr "Hypervisor non è in esecuzione. Per kvm carica i moduli del kernel kvm. Per eseguire xen, riavviare e caricare il kernel xen."
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.6/po/km.po new/vm-install-0.4.7/po/km.po
--- old/vm-install-0.4.6/po/km.po 2009-07-28 22:54:10.000000000 +0200
+++ new/vm-install-0.4.7/po/km.po 2009-08-04 00:28:23.000000000 +0200
@@ -1,14 +1,15 @@
-# translation of xen-vm-install.po to khmer
+# translation of xen-vm-install.po to Khmer
# Auk Piseth , 2007, 2008.
# Khoem Sokhem , 2008.
+# Khoem Sokhem , 2009.
msgid ""
msgstr ""
"Project-Id-Version: xen-vm-install\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-08-22 09:29-0600\n"
-"PO-Revision-Date: 2008-11-18 14:01+0700\n"
-"Last-Translator: Auk Piseth \n"
-"Language-Team: khmer \n"
+"PO-Revision-Date: 2009-07-31 11:08+0700\n"
+"Last-Translator: Khoem Sokhem \n"
+"Language-Team: Khmer \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -195,7 +196,7 @@
#: src/vminstall/msg.py:87
msgid "Two of the virtual disks have conflicting virtual names or physical devices."
-msgstr "ថាសនិម្មិតពីរ មានឈ្មោះនិម្មិត ឬឧបករណ៍ពិតប៉ះទង្គិចគ្នា ។"
+msgstr "ថាសនិម្មិតពីរ មានឈ្មោះនិម្មិត ឬឧបករណ៍ហ្វីស៊ីខលប៉ះទង្គិចគ្នា ។"
#: src/vminstall/msg.py:88
msgid "Not enough space on device for disk image."
@@ -853,3 +854,4 @@
#: src/vminstall/msg.py:290
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 ""
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.6/po/pl.po new/vm-install-0.4.7/po/pl.po
--- old/vm-install-0.4.6/po/pl.po 2009-07-28 22:54:10.000000000 +0200
+++ new/vm-install-0.4.7/po/pl.po 2009-08-04 00:28:23.000000000 +0200
@@ -13,8 +13,8 @@
"Project-Id-Version: xen-vm-install\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-08-22 09:29-0600\n"
-"PO-Revision-Date: 2009-03-11 18:03+0100\n"
-"Last-Translator: Mariusz Fik \n"
+"PO-Revision-Date: 2009-07-20 18:20+0100\n"
+"Last-Translator: Jakub Derda \n"
"Language-Team: Polish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -348,14 +348,12 @@
msgstr "Windows NT"
#: src/vminstall/msg.py:132
-#, fuzzy
msgid "Windows Vista, Windows 7"
-msgstr "Windows Vista"
+msgstr "Windows Vista, Windows 7"
#: src/vminstall/msg.py:133
-#, fuzzy
msgid "Windows Vista, Windows 7 (x64)"
-msgstr "Windows Vista (x64)"
+msgstr "Windows Vista, Windows 7 (x64)"
#: src/vminstall/msg.py:134
msgid "Windows Server 2008"
@@ -455,11 +453,11 @@
#: src/vminstall/msg.py:162
msgid "Username:"
-msgstr ""
+msgstr "Nazwa użytkownika:"
#: src/vminstall/msg.py:163
msgid "Password:"
-msgstr ""
+msgstr "Hasło:"
#: src/vminstall/msg.py:166
msgid "Create a Virtual Machine"
@@ -598,7 +596,7 @@
#: src/vminstall/msg.py:206
msgid "Press 'q' or the Escape key to exit."
-msgstr ""
+msgstr "Aby wyjść, naciśnij 'q' lub klawisz Esc."
#: src/vminstall/msg.py:209
msgid "Specify the amount of memory and number of processors to allocate for the VM."
@@ -674,9 +672,8 @@
msgstr "PXE"
#: src/vminstall/msg.py:234
-#, fuzzy
msgid "Can't reach the pxe server. Possible reasons are an improperly configured network or firewall restrictions."
-msgstr "Serwer pxe jest nieosiągalny . Możliwe przyczyny: niepoprawnie skonfigurowana sieć, SuSEfirewall2 albo iptables -L"
+msgstr "Serwer pxe jest nieosiągalny. Możliwe przyczyny to niepoprawnie skonfigurowana sieć lub restrykcje zapory sieciowej."
#: src/vminstall/msg.py:235
msgid "Can't get the pxelinux.cfg/default file from the pxe server."
@@ -849,4 +846,4 @@
#: src/vminstall/msg.py:290
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 ""
+msgstr "Hyperwizor nie jest uruchomiony. Dla kvm, należy wczytać moduły jądra kvm. Aby uruchomić xen, należy uruchomić ponownie system oraz wczytać jądro xen."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.6/po/xen-vm-install.pot new/vm-install-0.4.7/po/xen-vm-install.pot
--- old/vm-install-0.4.6/po/xen-vm-install.pot 2009-07-28 22:54:10.000000000 +0200
+++ new/vm-install-0.4.7/po/xen-vm-install.pot 2009-08-04 00:28:23.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-22 09:29-0600\n"
+"POT-Creation-Date: 2009-08-03 10:02-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -143,440 +143,464 @@
msgid "No kernel was found. The installation may have failed."
msgstr ""
-#: src/vminstall/msg.py:68
-msgid "The installation source is using an unsupported protocol."
+#: src/vminstall/msg.py:66
+msgid "You must shutdown the VM before upgrading."
msgstr ""
#: src/vminstall/msg.py:69
-msgid "An error occurred while reading from the installation source."
+msgid "The installation source is using an unsupported protocol."
msgstr ""
#: src/vminstall/msg.py:70
-msgid "The installation source was not found."
+msgid "An error occurred while reading from the installation source."
msgstr ""
#: src/vminstall/msg.py:71
-msgid "The installation source is unusable."
+msgid "The installation source was not found."
msgstr ""
#: src/vminstall/msg.py:72
-msgid "No installation source was defined."
+msgid "The installation source is unusable."
msgstr ""
#: src/vminstall/msg.py:73
+msgid "No installation source was defined."
+msgstr ""
+
+#: src/vminstall/msg.py:74
msgid "A CD-ROM or DVD must be specified from which to boot."
msgstr ""
-#: src/vminstall/msg.py:76
+#: src/vminstall/msg.py:75
+msgid "An error occurred while reading the configuration file."
+msgstr ""
+
+#: src/vminstall/msg.py:78
msgid ""
"The operating system is incompatible with the processor architecture of this "
"machine."
msgstr ""
-#: src/vminstall/msg.py:77
+#: src/vminstall/msg.py:79
msgid "The processor(s) in this machine do not support full virtualization."
msgstr ""
-#: src/vminstall/msg.py:78
+#: src/vminstall/msg.py:80
msgid ""
"The processor(s) in this machine support full virtualization, but it is "
"disabled in the BIOS."
msgstr ""
-#: src/vminstall/msg.py:81
+#: src/vminstall/msg.py:83
msgid "Not enough memory."
msgstr ""
-#: src/vminstall/msg.py:84
+#: src/vminstall/msg.py:86
msgid "The disk does not exist."
msgstr ""
-#: src/vminstall/msg.py:85
+#: src/vminstall/msg.py:87
msgid "The disk is read-only."
msgstr ""
-#: src/vminstall/msg.py:86
+#: src/vminstall/msg.py:88
msgid "Permission was denied while attempting to access the disk."
msgstr ""
-#: src/vminstall/msg.py:87
+#: src/vminstall/msg.py:89
msgid ""
"Two of the virtual disks have conflicting virtual names or physical devices."
msgstr ""
-#: src/vminstall/msg.py:88
+#: src/vminstall/msg.py:90
msgid "Not enough space on device for disk image."
msgstr ""
-#: src/vminstall/msg.py:91
+#: src/vminstall/msg.py:93
msgid "The job was canceled."
msgstr ""
-#: src/vminstall/msg.py:92
+#: src/vminstall/msg.py:94
msgid "The job was not found."
msgstr ""
-#: src/vminstall/msg.py:93
+#: src/vminstall/msg.py:95
msgid "The job is in the wrong state to perform that action."
msgstr ""
-#: src/vminstall/msg.py:96
+#: src/vminstall/msg.py:98
msgid "A parameter is invalid or missing."
msgstr ""
-#: src/vminstall/msg.py:97
+#: src/vminstall/msg.py:99
msgid "The operating system does not support paravirtualization."
msgstr ""
-#: src/vminstall/msg.py:98
+#: src/vminstall/msg.py:100
msgid "The operating system does not support automated installations."
msgstr ""
-#: src/vminstall/msg.py:99
+#: src/vminstall/msg.py:101
msgid "The operating system does not support full virtualization."
msgstr ""
#: src/vminstall/msg.py:102
+msgid "The operating system cannot be upgraded from this tool."
+msgstr ""
+
+#: src/vminstall/msg.py:105
msgid "NetWare"
msgstr ""
-#: src/vminstall/msg.py:103
+#: src/vminstall/msg.py:106
msgid "RedHat"
msgstr ""
-#: src/vminstall/msg.py:104
+#: src/vminstall/msg.py:107
msgid "SUSE"
msgstr ""
-#: src/vminstall/msg.py:105
+#: src/vminstall/msg.py:108
msgid "Windows"
msgstr ""
-#: src/vminstall/msg.py:106
+#: src/vminstall/msg.py:109
msgid "Solaris"
msgstr ""
-#: src/vminstall/msg.py:107
+#: src/vminstall/msg.py:110
msgid "Other"
msgstr ""
-#: src/vminstall/msg.py:110
+#: src/vminstall/msg.py:113
msgid "Novell NetWare 6.5 SP6 and older"
msgstr ""
-#: src/vminstall/msg.py:111
+#: src/vminstall/msg.py:114
msgid "Novell Open Enterprise Server 2 (Linux)"
msgstr ""
-#: src/vminstall/msg.py:112
+#: src/vminstall/msg.py:115
msgid "Novell Open Enterprise Server 2 (NetWare)"
msgstr ""
-#: src/vminstall/msg.py:113
+#: src/vminstall/msg.py:116
msgid "openSUSE"
msgstr ""
-#: src/vminstall/msg.py:114
+#: src/vminstall/msg.py:117
msgid "openSUSE 11"
msgstr ""
-#: src/vminstall/msg.py:115
+#: src/vminstall/msg.py:118
msgid "Other operating system"
msgstr ""
-#: src/vminstall/msg.py:116
+#: src/vminstall/msg.py:119
msgid "RedHat (other)"
msgstr ""
-#: src/vminstall/msg.py:117
+#: src/vminstall/msg.py:120
msgid "RedHat Enterprise Linux 3"
msgstr ""
-#: src/vminstall/msg.py:118
+#: src/vminstall/msg.py:121
msgid "RedHat Enterprise Linux 4"
msgstr ""
-#: src/vminstall/msg.py:119
+#: src/vminstall/msg.py:122
msgid "RedHat Enterprise Linux 5"
msgstr ""
-#: src/vminstall/msg.py:120
+#: src/vminstall/msg.py:123
msgid "SUSE Linux Enterprise Desktop 10"
msgstr ""
-#: src/vminstall/msg.py:121
+#: src/vminstall/msg.py:124
msgid "SUSE Linux Enterprise Desktop 11"
msgstr ""
-#: src/vminstall/msg.py:122
+#: src/vminstall/msg.py:125
msgid "SUSE Linux Enterprise Server 10"
msgstr ""
-#: src/vminstall/msg.py:123
+#: src/vminstall/msg.py:126
msgid "SUSE Linux Enterprise Server 11"
msgstr ""
-#: src/vminstall/msg.py:124
+#: src/vminstall/msg.py:127
msgid "SUSE Linux Enterprise Server 8"
msgstr ""
-#: src/vminstall/msg.py:125
+#: src/vminstall/msg.py:128
msgid "SUSE Linux Enterprise Server 9"
msgstr ""
-#: src/vminstall/msg.py:126
+#: src/vminstall/msg.py:129
msgid "Solaris 10"
msgstr ""
-#: src/vminstall/msg.py:127
+#: src/vminstall/msg.py:130
msgid "Solaris 9 and older"
msgstr ""
-#: src/vminstall/msg.py:128
+#: src/vminstall/msg.py:131
msgid "SUSE (other)"
msgstr ""
-#: src/vminstall/msg.py:129
+#: src/vminstall/msg.py:132
msgid "Windows (other)"
msgstr ""
-#: src/vminstall/msg.py:130
+#: src/vminstall/msg.py:133
msgid "Windows (other, x64)"
msgstr ""
-#: src/vminstall/msg.py:131
+#: src/vminstall/msg.py:134
msgid "Windows NT"
msgstr ""
-#: src/vminstall/msg.py:132
+#: src/vminstall/msg.py:135
msgid "Windows Vista, Windows 7"
msgstr ""
-#: src/vminstall/msg.py:133
+#: src/vminstall/msg.py:136
msgid "Windows Vista, Windows 7 (x64)"
msgstr ""
-#: src/vminstall/msg.py:134
+#: src/vminstall/msg.py:137
msgid "Windows Server 2008"
msgstr ""
-#: src/vminstall/msg.py:135
+#: src/vminstall/msg.py:138
msgid "Windows Server 2008 (x64)"
msgstr ""
-#: src/vminstall/msg.py:136
+#: src/vminstall/msg.py:139
msgid "Windows XP, 2000, 2003"
msgstr ""
-#: src/vminstall/msg.py:137
+#: src/vminstall/msg.py:140
msgid "Windows XP, 2003 (x64)"
msgstr ""
-#: src/vminstall/msg.py:140
+#: src/vminstall/msg.py:143
msgid "Gathering settings..."
msgstr ""
-#: src/vminstall/msg.py:141
+#: src/vminstall/msg.py:144
msgid "Preparing to start the installation..."
msgstr ""
-#: src/vminstall/msg.py:142
+#: src/vminstall/msg.py:145
msgid "Installing..."
msgstr ""
-#: src/vminstall/msg.py:143
+#: src/vminstall/msg.py:146
msgid "Please wait..."
msgstr ""
-#: src/vminstall/msg.py:144
+#: src/vminstall/msg.py:147
msgid "Waiting for the VM to stop before continuing..."
msgstr ""
-#: src/vminstall/msg.py:145
+#: src/vminstall/msg.py:148
msgid "Performing post-installation checks..."
msgstr ""
-#: src/vminstall/msg.py:146
+#: src/vminstall/msg.py:149
msgid "Creating the run-time configuration..."
msgstr ""
-#: src/vminstall/msg.py:147
+#: src/vminstall/msg.py:150
msgid "The configuration file has been written."
msgstr ""
-#: src/vminstall/msg.py:148
+#: src/vminstall/msg.py:151
msgid "Finishing the installation..."
msgstr ""
-#: src/vminstall/msg.py:149
+#: src/vminstall/msg.py:152
msgid "Finished."
msgstr ""
-#: src/vminstall/msg.py:152
+#: src/vminstall/msg.py:155
msgid "Paravirtualized"
msgstr ""
-#: src/vminstall/msg.py:153
+#: src/vminstall/msg.py:156
msgid "Fully virtualized"
msgstr ""
-#: src/vminstall/msg.py:154
+#: src/vminstall/msg.py:157
msgid "Paravirtualization"
msgstr ""
-#: src/vminstall/msg.py:155
+#: src/vminstall/msg.py:158
msgid "Full virtualization"
msgstr ""
-#: src/vminstall/msg.py:156
+#: src/vminstall/msg.py:159
msgid "Name"
msgstr ""
-#: src/vminstall/msg.py:157
+#: src/vminstall/msg.py:160
msgid "Type"
msgstr ""
-#: src/vminstall/msg.py:158
+#: src/vminstall/msg.py:161
msgid "Source"
msgstr ""
-#: src/vminstall/msg.py:159
+#: src/vminstall/msg.py:162
msgid "Browse"
msgstr ""
-#: src/vminstall/msg.py:160
+#: src/vminstall/msg.py:163
+msgid "Upgrade"
+msgstr ""
+
+#: src/vminstall/msg.py:164
msgid "Protocol"
msgstr ""
-#: src/vminstall/msg.py:161
+#: src/vminstall/msg.py:165
msgid "None"
msgstr ""
-#: src/vminstall/msg.py:162
+#: src/vminstall/msg.py:166
msgid "Username:"
msgstr ""
-#: src/vminstall/msg.py:163
+#: src/vminstall/msg.py:167
msgid "Password:"
msgstr ""
-#: src/vminstall/msg.py:166
+#: src/vminstall/msg.py:170
msgid "Create a Virtual Machine"
msgstr ""
-#: src/vminstall/msg.py:167
+#: src/vminstall/msg.py:171
msgid "Install an Operating System?"
msgstr ""
-#: src/vminstall/msg.py:168
+#: src/vminstall/msg.py:172
msgid "Type of Operating System"
msgstr ""
-#: src/vminstall/msg.py:169
+#: src/vminstall/msg.py:173
msgid "Summary"
msgstr ""
-#: src/vminstall/msg.py:170
+#: src/vminstall/msg.py:174
msgid "Virtualization Method"
msgstr ""
-#: src/vminstall/msg.py:171
+#: src/vminstall/msg.py:175
msgid "Name of Virtual Machine"
msgstr ""
-#: src/vminstall/msg.py:172
+#: src/vminstall/msg.py:176
msgid "Hardware"
msgstr ""
-#: src/vminstall/msg.py:173
+#: src/vminstall/msg.py:177
msgid "Graphics"
msgstr ""
-#: src/vminstall/msg.py:174
+#: src/vminstall/msg.py:178
msgid "Disks"
msgstr ""
-#: src/vminstall/msg.py:175 src/vminstall/msg.py:222
+#: src/vminstall/msg.py:179 src/vminstall/msg.py:228
msgid "Virtual Disk"
msgstr ""
-#: src/vminstall/msg.py:176
+#: src/vminstall/msg.py:180
msgid "Network Adapters"
msgstr ""
-#: src/vminstall/msg.py:177
+#: src/vminstall/msg.py:181
msgid "Virtual Network Adapter"
msgstr ""
-#: src/vminstall/msg.py:178
+#: src/vminstall/msg.py:182
msgid "Operating System Installation"
msgstr ""
-#: src/vminstall/msg.py:179
+#: src/vminstall/msg.py:183
msgid "Operating System Settings"
msgstr ""
-#: src/vminstall/msg.py:182
+#: src/vminstall/msg.py:184
+msgid "Operating System Upgrade"
+msgstr ""
+
+#: src/vminstall/msg.py:187
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:183
+#: src/vminstall/msg.py:188
msgid "The <b>type of operating system</b> that will run in the new VM"
msgstr ""
-#: src/vminstall/msg.py:184
+#: src/vminstall/msg.py:189
msgid ""
"Whether the VM will be <b>fully virtualized</b> or <b>paravirtualized</b>"
msgstr ""
-#: src/vminstall/msg.py:185
+#: src/vminstall/msg.py:190
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:186
+#: src/vminstall/msg.py:191
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:188
+#: src/vminstall/msg.py:193
#, python-format
msgid ""
"For the most current information on Novell VM server technology, see %(url)s"
msgstr ""
-#: src/vminstall/msg.py:189
+#: src/vminstall/msg.py:194
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:190
+#: src/vminstall/msg.py:195
msgid "I need to install an operating system."
msgstr ""
-#: src/vminstall/msg.py:191
+#: src/vminstall/msg.py:196
msgid "I have a disk or disk image with an installed operating system."
msgstr ""
-#: src/vminstall/msg.py:192
+#: src/vminstall/msg.py:197
+msgid "I need to upgrade an existing operating system."
+msgstr ""
+
+#: src/vminstall/msg.py:198
msgid "Please choose a name for the virtual machine."
msgstr ""
-#: src/vminstall/msg.py:193
+#: src/vminstall/msg.py:199
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:194
+#: src/vminstall/msg.py:200
msgid ""
"Virtual machines can use paravirtualization or full virtualization. "
"Paravirtualization is faster but requires operating system support. Full "
@@ -584,310 +608,326 @@
"hardware support. Which do you prefer?"
msgstr ""
-#: src/vminstall/msg.py:195
+#: src/vminstall/msg.py:201
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:196
+#: src/vminstall/msg.py:202
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:197
+#: src/vminstall/msg.py:203
msgid ""
"Some operating systems accept additional arguments, used to customize the "
"installation or boot process."
msgstr ""
-#: src/vminstall/msg.py:198
+#: src/vminstall/msg.py:204
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:201
+#: src/vminstall/msg.py:207
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:204
+#: src/vminstall/msg.py:210
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:205
+#: src/vminstall/msg.py:211
msgid "Please specify the settings for the virtual network adapter."
msgstr ""
-#: src/vminstall/msg.py:206
+#: src/vminstall/msg.py:212
msgid "Press 'q' or the Escape key to exit."
msgstr ""
-#: src/vminstall/msg.py:209
+#: src/vminstall/msg.py:215
msgid ""
"Specify the amount of memory and number of processors to allocate for the VM."
msgstr ""
-#: src/vminstall/msg.py:210
+#: src/vminstall/msg.py:216
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:213
+#: src/vminstall/msg.py:219
msgid ""
"Paravirtualized graphics require that an appropriate driver is installed in "
"the operating system."
msgstr ""
-#: src/vminstall/msg.py:214
+#: src/vminstall/msg.py:220
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:215
+#: src/vminstall/msg.py:221
msgid "Please specify the type of virtualized graphics hardware."
msgstr ""
-#: src/vminstall/msg.py:216
+#: src/vminstall/msg.py:222
msgid "Paravirtualized Graphics Adapter"
msgstr ""
-#: src/vminstall/msg.py:217
+#: src/vminstall/msg.py:223
msgid "VESA VGA"
msgstr ""
-#: src/vminstall/msg.py:218
+#: src/vminstall/msg.py:224
msgid "Cirrus Logic GD5446 VGA"
msgstr ""
-#: src/vminstall/msg.py:219
+#: src/vminstall/msg.py:225
msgid "No Graphics Support"
msgstr ""
-#: src/vminstall/msg.py:223
+#: src/vminstall/msg.py:229
msgid "Virtual Disks"
msgstr ""
-#: src/vminstall/msg.py:224
+#: src/vminstall/msg.py:230
msgid "PXE Boot"
msgstr ""
-#: src/vminstall/msg.py:225
+#: src/vminstall/msg.py:231
msgid "Size (GB)"
msgstr ""
-#: src/vminstall/msg.py:226
+#: src/vminstall/msg.py:232
msgid "Create Sparse Image File"
msgstr ""
-#: src/vminstall/msg.py:227
+#: src/vminstall/msg.py:233
msgid "Read-Only Access"
msgstr ""
-#: src/vminstall/msg.py:228
+#: src/vminstall/msg.py:234
msgid "Hard Disk"
msgstr ""
-#: src/vminstall/msg.py:229
+#: src/vminstall/msg.py:235
msgid "CD-ROM or DVD"
msgstr ""
-#: src/vminstall/msg.py:230
+#: src/vminstall/msg.py:236
msgid "Floppy Disk"
msgstr ""
-#: src/vminstall/msg.py:231
+#: src/vminstall/msg.py:237
msgid "PXE"
msgstr ""
-#: src/vminstall/msg.py:234
+#: src/vminstall/msg.py:240
msgid ""
"Can't reach the pxe server. Possible reasons are an improperly configured "
"network or firewall restrictions."
msgstr ""
-#: src/vminstall/msg.py:235
+#: src/vminstall/msg.py:241
msgid "Can't get the pxelinux.cfg/default file from the pxe server."
msgstr ""
-#: src/vminstall/msg.py:236
+#: src/vminstall/msg.py:242
msgid "Can't download the kernel and initrd from the server."
msgstr ""
-#: src/vminstall/msg.py:237
+#: src/vminstall/msg.py:243
msgid ""
"This kernel image may not be a paravirtualized xen kernel required for "
"installation, Continue?"
msgstr ""
-#: src/vminstall/msg.py:240
+#: src/vminstall/msg.py:246
msgid "Fully Virtualized Intel e100"
msgstr ""
-#: src/vminstall/msg.py:241
+#: src/vminstall/msg.py:247
msgid "Fully Virtualized Intel e1000"
msgstr ""
-#: src/vminstall/msg.py:242
+#: src/vminstall/msg.py:248
msgid "Fully Virtualized AMD PCnet 32"
msgstr ""
-#: src/vminstall/msg.py:243
+#: src/vminstall/msg.py:249
msgid "Fully Virtualized NE2000 (ISA Bus)"
msgstr ""
-#: src/vminstall/msg.py:244
+#: src/vminstall/msg.py:250
msgid "Fully Virtualized NE2000 (PCI Bus)"
msgstr ""
-#: src/vminstall/msg.py:245
+#: src/vminstall/msg.py:251
msgid "Fully Virtualized Realtek 8139"
msgstr ""
-#: src/vminstall/msg.py:246
+#: src/vminstall/msg.py:252
msgid "MAC Address"
msgstr ""
-#: src/vminstall/msg.py:247
+#: src/vminstall/msg.py:253
msgid "Randomly generated MAC address"
msgstr ""
-#: src/vminstall/msg.py:248
+#: src/vminstall/msg.py:254
msgid "Specified MAC address"
msgstr ""
-#: src/vminstall/msg.py:251
+#: src/vminstall/msg.py:257
msgid "Additional Arguments"
msgstr ""
-#: src/vminstall/msg.py:252
+#: src/vminstall/msg.py:258
msgid "Network URL"
msgstr ""
-#: src/vminstall/msg.py:253
+#: src/vminstall/msg.py:259
msgid "Memory"
msgstr ""
-#: src/vminstall/msg.py:254
+#: src/vminstall/msg.py:260
msgid "Processors"
msgstr ""
-#: src/vminstall/msg.py:255
+#: src/vminstall/msg.py:261
msgid "Automated install file or URL"
msgstr ""
-#: src/vminstall/msg.py:256
+#: src/vminstall/msg.py:262
msgid "Available Memory"
msgstr ""
-#: src/vminstall/msg.py:257
+#: src/vminstall/msg.py:263
msgid "Available Processors"
msgstr ""
-#: src/vminstall/msg.py:258
+#: src/vminstall/msg.py:264
msgid "Initial Memory"
msgstr ""
-#: src/vminstall/msg.py:259
+#: src/vminstall/msg.py:265
msgid "Maximum Memory"
msgstr ""
-#: src/vminstall/msg.py:260
+#: src/vminstall/msg.py:266
msgid "Virtual Processors"
msgstr ""
-#: src/vminstall/msg.py:261
+#: src/vminstall/msg.py:267
msgid "Installation Source"
msgstr ""
-#: src/vminstall/msg.py:262
+#: src/vminstall/msg.py:268
msgid "Automated Installation"
msgstr ""
-#: src/vminstall/msg.py:263
+#: src/vminstall/msg.py:269
msgid "Operating System"
msgstr ""
-#: src/vminstall/msg.py:264
+#: src/vminstall/msg.py:270
msgid "Power Off"
msgstr ""
-#: src/vminstall/msg.py:265
+#: src/vminstall/msg.py:271
msgid "Reboot"
msgstr ""
-#: src/vminstall/msg.py:266
+#: src/vminstall/msg.py:272
msgid "Crash"
msgstr ""
-#: src/vminstall/msg.py:269
+#: src/vminstall/msg.py:275
msgid "Kickstart file or URL"
msgstr ""
-#: src/vminstall/msg.py:270
+#: src/vminstall/msg.py:276
msgid "AutoYaST file"
msgstr ""
-#: src/vminstall/msg.py:271
+#: src/vminstall/msg.py:277
msgid "NetWare response file"
msgstr ""
-#: src/vminstall/msg.py:274
+#: src/vminstall/msg.py:280
msgid "Creating the Virtual Machine"
msgstr ""
-#: src/vminstall/msg.py:275
+#: src/vminstall/msg.py:281
msgid "Writing the configuration file"
msgstr ""
-#: src/vminstall/msg.py:276
+#: src/vminstall/msg.py:282
msgid "Locate Operating System Settings File"
msgstr ""
-#: src/vminstall/msg.py:277
+#: src/vminstall/msg.py:283
msgid "Locate Disk or Disk Image"
msgstr ""
-#: src/vminstall/msg.py:280
+#: src/vminstall/msg.py:286
msgid "Do you want to add another virtual disk?"
msgstr ""
-#: src/vminstall/msg.py:281
+#: src/vminstall/msg.py:287
msgid "Do you want to add another virtual network adapter?"
msgstr ""
-#: src/vminstall/msg.py:282
+#: src/vminstall/msg.py:288
msgid "What type of virtual disk do you want to add?"
msgstr ""
-#: src/vminstall/msg.py:283
+#: src/vminstall/msg.py:289
msgid "Where will the virtual disk physically reside?"
msgstr ""
-#: src/vminstall/msg.py:284
+#: src/vminstall/msg.py:290
msgid "What type of virtual network adapter do you want to add?"
msgstr ""
-#: src/vminstall/msg.py:285
+#: src/vminstall/msg.py:291
msgid "Create a sparse image file for the virtual disk?"
msgstr ""
-#: src/vminstall/msg.py:287
+#: src/vminstall/msg.py:293
msgid "Default"
msgstr ""
-#: src/vminstall/msg.py:290
+#: src/vminstall/msg.py:296
+msgid "Operating System Type"
+msgstr ""
+
+#: src/vminstall/msg.py:297
+msgid "Managed Virtual Machines"
+msgstr ""
+
+#: src/vminstall/msg.py:298
+msgid "Configuration File"
+msgstr ""
+
+#: src/vminstall/msg.py:299
+msgid "Specify the URL containing the network installation source."
+msgstr ""
+
+#: src/vminstall/msg.py:302
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.4.6/setup.py new/vm-install-0.4.7/setup.py
--- old/vm-install-0.4.6/setup.py 2009-07-29 00:20:52.000000000 +0200
+++ new/vm-install-0.4.7/setup.py 2009-08-04 00:33:13.000000000 +0200
@@ -1,7 +1,7 @@
from distutils.core import setup
setup(name='vminstall',
- version='0.4.6',
+ version='0.4.7',
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.4.6/src/vmdisks/disks.py new/vm-install-0.4.7/src/vmdisks/disks.py
--- old/vm-install-0.4.6/src/vmdisks/disks.py 2009-07-28 22:54:10.000000000 +0200
+++ new/vm-install-0.4.7/src/vmdisks/disks.py 2009-08-05 22:48:58.000000000 +0200
@@ -99,14 +99,14 @@
os.close(fd)
progress(1.0)
-def create_qcow(filename, bytes, arg={}, progress=lambda f:None):
+def create_with_qemu(type, filename, bytes, arg={}, progress=lambda f:None):
log.debug("Creating qcow file '%s', %d bytes." % (filename, bytes))
mb = str(bytes / 1024 / 1024)
if os.path.exists('/usr/bin/qemu-img-xen'):
mb = mb + 'M'
- fmt = '-fqcow2'
+ fmt = '-f' + type
vminstall.util.run(['/usr/bin/qemu-img-xen', 'create', fmt, filename, mb])
- else:
+ elif os.path.exists('/usr/bin/qcow-create'):
vminstall.util.run(['/usr/sbin/qcow-create', mb, filename])
def devid_to_devstr(devid):
@@ -226,7 +226,7 @@
dpath = os.path.dirname(path)
if not os.path.exists(dpath):
os.makedirs(dpath)
- create_qcow(path, blocks * 512, args, progress=progress)
+ create_with_qemu('qcow2', path, blocks * 512, args, progress=progress)
def vsize(self, path):
if os.path.exists(path):
try:
@@ -243,7 +243,41 @@
def is_local(self):
return True
+class QemuDriver(FileDriver):
+ def create(self, path, blocks, args={}, progress=lambda f:None):
+ dpath = os.path.dirname(path)
+ if not os.path.exists(dpath):
+ os.makedirs(dpath)
+ create_with_qemu(self.proto, path, blocks * 512, args, progress=progress)
+ def vsize(self, path):
+ if self.proto == 'qcow2':
+ if os.path.exists(path):
+ try:
+ fd = os.open(path, os.O_RDONLY)
+ buf = os.read(fd, 32)
+ except:
+ return None
+ os.close(fd)
+ if len(buf) == 32:
+ data = struct.unpack('>IIQIIQ', buf)
+ blocks = data[-1] / 512
+ return blocks
+ else:
+ try:
+ stats = os.stat(path)
+ return stats.st_size / 512 or None
+ except:
+ return None
+ return None
+ def is_local(self):
+ return True
+ def block_attach(self, disk):
+ # Raw files are already visible in the local filesystem; good enough.
+ disk._block_vdev = disk.get_path()
+ def block_detach(self, disk):
+ disk._block_vdev = None
+default_proto = 'file'
DRIVERS = {
'file': LoopDriver('file'),
'iscsi': Driver('iscsi'),
@@ -255,8 +289,24 @@
'tap:qcow2': TapQcow2Driver('tap:qcow2'),
'tap:vmdk': TapVmdkDriver('tap:vmdk'),
}
-default_proto = 'file'
disk_protocols = ["file:", "iscsi:", "nbd:", "npiv:", "phy:", "tap:aio:", "tap:cdrom:", "tap:qcow2:", "tap:vmdk:"]
+KVM_DRIVERS = {
+ 'bochs': QemuDriver('bochs'),
+ 'cloop': QemuDriver('cloop'),
+ 'cow': QemuDriver('cow'),
+ 'dmg': QemuDriver('dmg'),
+ 'file': LoopDriver('file'),
+ 'nbd': QemuDriver('nbd'),
+ 'parallels': QemuDriver('parallels'),
+ 'phy': PhyDriver('phy'),
+ 'qcow': QemuDriver('qcow'),
+ 'qcow2': QemuDriver('qcow2'),
+ 'raw': LoopDriver('raw'),
+ 'vmdk': QemuDriver('vmdk'),
+ 'vpc': QemuDriver('vpc'),
+ 'vvfat': QemuDriver('vvfat'),
+}
+kvm_disk_protocols = ["bochs:", "cloop:", "cow:", "dmg:", "file:", "nbd:", "parallels:", "phy:", "qcow:", "qcow2:", "raw:", "vmdk:", "vpc:", "vvfat:"]
def parse_string(disk, extended=False, blocks=None):
"""Parses a text representation of a disk, and returns such a disk object.
@@ -356,11 +406,16 @@
if len(subproto) == 2:
proto = '%s:%s' % (proto, subproto[0])
path = subproto[1]
- if proto not in DRIVERS:
+ drivers = {}
+ if vminstall.caps.is_kvm():
+ drivers = KVM_DRIVERS
+ else:
+ drivers = DRIVERS
+ if proto not in drivers:
# Assume no protocol and that colon was part of pathname. Undo everything.
path = '%s:%s' % (proto, path)
proto = guess_proto(path)
- return (DRIVERS[proto], path)
+ return (drivers[proto], path)
class Disk(object):
@@ -398,6 +453,11 @@
self.set_ro(ro)
self.args = args
+ if vminstall.caps.is_kvm():
+ self._protocols = kvm_disk_protocols
+ else:
+ self._protocols = disk_protocols
+
def __del__(self):
self.block_detach()
@@ -640,7 +700,10 @@
self.driver, self._path = split_driver_path(pdev)
self._template = False
else:
- self.driver = DRIVERS[default_proto]
+ if vminstall.caps.is_kvm():
+ self.driver = KVM_DRIVERS[default_proto]
+ else:
+ self.driver = DRIVERS[default_proto]
self._template = True
self._path = None
pdev = property(get_pdev, set_pdev)
@@ -746,7 +809,10 @@
try:
disk_type = proto2disktype[vals[0]]
except KeyError,e:
- disk_type = vals[0]
+ if vminstall.caps.is_kvm():
+ disk_type = 'file'
+ else:
+ disk_type = vals[0]
disk_element = "<disk type='%s' device='%s'>" % (disk_type, self._vdevType),
#
@@ -757,7 +823,8 @@
# type: The sub-type.
#
if len(vals) == 1:
- if vminstall.caps.is_kvm() and vals[0] == 'file':
+ #if vminstall.caps.is_kvm() and vals[0] == 'file':
+ if vminstall.caps.is_kvm():
opts.append("<driver name='qemu'/>")
else:
opts.append("<driver name='%s'/>" % vals[0])
@@ -851,9 +918,9 @@
else:
index=0
pathname = device_name
- while index < len(disk_protocols):
- if device_name.startswith(disk_protocols[index]):
- pathname = device_name[len(disk_protocols[index]):]
+ while index < len(self._protocols):
+ if device_name.startswith(self._protocols[index]):
+ pathname = device_name[len(self._protocols[index]):]
break
index += 1
device_name = pathname
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.6/src/vminstall/gtk/disk_widgets.py new/vm-install-0.4.7/src/vminstall/gtk/disk_widgets.py
--- old/vm-install-0.4.6/src/vminstall/gtk/disk_widgets.py 2009-07-17 17:58:42.000000000 +0200
+++ new/vm-install-0.4.7/src/vminstall/gtk/disk_widgets.py 2009-08-04 00:29:08.000000000 +0200
@@ -13,10 +13,11 @@
import vminstall.msg
import vminstall.log
import vminstall.paths
+import vminstall.caps
import vmdisks
from tree_view import *
from chooser import *
-from vmdisks.disks import disk_protocols
+from vmdisks.disks import disk_protocols, kvm_disk_protocols
class DisksView(PyTreeView):
def __init__(self, disks, renumber=True):
@@ -202,7 +203,22 @@
self.disk_edit_widget = self.glade.get_widget('disk-edit')
self.disk_edit_widget.get_parent().remove(self.disk_edit_widget)
self.topwin.destroy()
-
+
+ if vminstall.caps.is_kvm():
+ self._protocols = kvm_disk_protocols
+ else:
+ self._protocols = disk_protocols
+ combo = self.glade.get_widget('disk-protocol')
+ model = gtk.ListStore(gobject.TYPE_STRING)
+ for item in self._protocols:
+ item = item.rstrip(':')
+ model.append([item])
+ combo.set_model(model)
+ combo.clear()
+ cell = gtk.CellRendererText()
+ combo.pack_start(cell, True)
+ combo.add_attribute(cell, 'text', 0)
+
self._default_cdrom = None
self.disk_folder = vminstall.paths.imagedir
@@ -428,9 +444,9 @@
text = None
index=0
if disktext:
- while index < len(disk_protocols):
- if disktext.startswith(disk_protocols[index]):
- text = disk_protocols[index]
+ while index < len(self._protocols):
+ if disktext.startswith(self._protocols[index]):
+ text = self._protocols[index]
break
index += 1
if text is None:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.6/src/vminstall/job.py new/vm-install-0.4.7/src/vminstall/job.py
--- old/vm-install-0.4.6/src/vminstall/job.py 2009-07-30 01:23:44.000000000 +0200
+++ new/vm-install-0.4.7/src/vminstall/job.py 2009-08-12 23:01:18.000000000 +0200
@@ -535,11 +535,9 @@
return fname
def _state_prep_install(self, progress):
- if not self._options.install:
+ if self._options.install == OS_INSTALL_NO:
return
-
self.guest.PreInstall(lambda f:progress(f*0.98))
-
log.info("Writing install-time configuration file...")
if self._options.install == OS_INSTALL_UPGRADE:
self._upgrade_conf = self._write_upgrade_conf()
@@ -552,6 +550,8 @@
#if self._options.install == OS_INSTALL_UPGRADE:
# raise JobError(JobError.E_CANCELED)
# return
+ if self._options.install == OS_INSTALL_NO:
+ return
self.guest.Start()
if self._options.install != OS_INSTALL_UPGRADE:
self.guest.manage_disks()
@@ -578,8 +578,6 @@
progress(1.0)
def _state_runtime(self, progress):
- if self._options.install == OS_INSTALL_NO:
- return
if self._options.norestart:
return
self.guest.start_from_disk()
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org