Hello community,
here is the log from the commit of package vm-install for openSUSE:Factory
checked in at Thu Dec 4 13:06:47 CET 2008.
--------
--- arch/i386/vm-install/vm-install.changes 2008-11-21 00:10:18.000000000 +0100
+++ /mounts/work_src_done/STABLE/vm-install/vm-install.changes 2008-12-03 22:46:57.606811000 +0100
@@ -1,0 +2,33 @@
+Tue Dec 2 16:27:58 MST 2008 - carnold@novell.com
+
+- bnc#450391 – VMM installation source error
+- bnc#451042 - Unable to create a Xen guest in SLES11-Beta6 in a
+ full-virt machine.
+
+-------------------------------------------------------------------
+Mon Dec 1 16:13:29 MST 2008 - carnold@novell.com
+
+- bnc#449046 - - [ XEN-install ] - Target install operating system
+ name was changed into 'pxe' incorrectly in paravirtualization
+ mode - Kong Wei patches.
+- Updated several language files to recent versions.
+
+-------------------------------------------------------------------
+Wed Nov 26 13:41:33 MST 2008 - carnold@novell.com
+
+- bnc#449376 - switching to fully-virtual in vm-install keeps
+ old network installation setting visible.
+
+-------------------------------------------------------------------
+Tue Nov 25 13:18:29 MST 2008 - carnold@novell.com
+
+- bnc#447348 - Error diplaying console when launching NW 6.5 SP8
+ guest install
+
+-------------------------------------------------------------------
+Mon Nov 24 16:08:10 MST 2008 - carnold@novell.com
+
+- bnc#448399 - Windows Vista VMs are routinely running out of disk
+ space
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
vm-install-0.3.16.tar.bz2
New:
----
vm-install-0.3.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vm-install.spec ++++++
--- /var/tmp/diff_new_pack.z30407/_old 2008-12-04 13:06:17.000000000 +0100
+++ /var/tmp/diff_new_pack.z30407/_new 2008-12-04 13:06:17.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package vm-install (Version 0.3.16)
+# spec file for package vm-install (Version 0.3.17)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -26,10 +26,10 @@
License: GPL v2 or later
Group: System/Emulators/PC
AutoReqProv: yes
-Version: 0.3.16
+Version: 0.3.17
Release: 1
Summary: Tool to Define a Virtual Machine and Install Its Operating System
-Source0: %{name}-0.3.16.tar.bz2
+Source0: %{name}-0.3.17.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
Requires: xen-tools python-urlgrabber libxml2-python libvirt-python udhcp tftp
@@ -86,6 +86,24 @@
%{_datadir}/applications/YaST2/vm-install.desktop
%changelog
+* Tue Dec 02 2008 carnold@novell.com
+- bnc#450391 – VMM installation source error
+- bnc#451042 - Unable to create a Xen guest in SLES11-Beta6 in a
+ full-virt machine.
+* Mon Dec 01 2008 carnold@novell.com
+- bnc#449046 - - [ XEN-install ] - Target install operating system
+ name was changed into 'pxe' incorrectly in paravirtualization
+ mode - Kong Wei patches.
+- Updated several language files to recent versions.
+* Wed Nov 26 2008 carnold@novell.com
+- bnc#449376 - switching to fully-virtual in vm-install keeps
+ old network installation setting visible.
+* Tue Nov 25 2008 carnold@novell.com
+- bnc#447348 - Error diplaying console when launching NW 6.5 SP8
+ guest install
+* Mon Nov 24 2008 carnold@novell.com
+- bnc#448399 - Windows Vista VMs are routinely running out of disk
+ space
* Thu Nov 20 2008 carnold@novell.com
- bnc#446773 - write bridge out to config file so libvirt doesn't
fail for virt-manager.
++++++ vm-install-0.3.16.tar.bz2 -> vm-install-0.3.17.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.16/Makefile new/vm-install-0.3.17/Makefile
--- old/vm-install-0.3.16/Makefile 2008-11-20 23:37:06.000000000 +0100
+++ new/vm-install-0.3.17/Makefile 2008-12-03 22:47:17.000000000 +0100
@@ -1,5 +1,5 @@
PACKAGE = vm-install
-VER = 0.3.16
+VER = 0.3.17
default:
@echo "Run 'make install DESTDIR=$destdir' to install."
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.16/po/de.po new/vm-install-0.3.17/po/de.po
--- old/vm-install-0.3.16/po/de.po 2008-11-19 00:06:45.000000000 +0100
+++ new/vm-install-0.3.17/po/de.po 2008-12-01 18:48:33.000000000 +0100
@@ -1,19 +1,21 @@
# translation of xen-vm-install.de.po to German
+#
# Michael Skiba , 2008.
# Hermann J. Beckers , 2008.
+# Marko Schugardt , 2008.
+#
msgid ""
msgstr ""
"Project-Id-Version: xen-vm-install.de\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-08-22 09:29-0600\n"
-"PO-Revision-Date: 2008-10-03 13:53+0200\n"
-"Last-Translator: Hermann J. Beckers \n"
-"Language-Team: German \n"
+"PO-Revision-Date: Sun Nov 30 15:04:12 UTC 2008\n"
+"Last-Translator: Marko Schugardt \n"
+"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 0.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: src/vminstall/msg.py:22
msgid "Installation Error"
@@ -660,23 +662,20 @@
msgstr "Kann die pxelinux.cfg/default-Datei nicht vom PXE-Server abrufen."
#: src/vminstall/msg.py:232
-#, fuzzy
msgid "Can't download the kernel and initrd from the server."
-msgstr "Kann Kernel und initrd nicht vom Server abrufen."
+msgstr "Der Kernel und initrd können nicht vom Server heruntergeladen werden."
#: src/vminstall/msg.py:233
msgid "This kernel image may not be a paravirtualized xen kernel required for installation, Continue?"
msgstr "Dieses Kernel-Abbild kann ein nicht paravirtualisierter xen-Kernel sein, der für die Installation erforderlich ist. Fortfahren?"
#: src/vminstall/msg.py:236
-#, fuzzy
msgid "Fully Virtualized Intel e100"
-msgstr "Vollvirtualisierte Realtek 8139"
+msgstr "Vollvirtualisierte Intel e100"
#: src/vminstall/msg.py:237
-#, fuzzy
msgid "Fully Virtualized Intel e1000"
-msgstr "Vollvirtualisierte Realtek 8139"
+msgstr "Vollvirtualisierte Intel e1000"
#: src/vminstall/msg.py:238
msgid "Fully Virtualized AMD PCnet 32"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.16/po/es.po new/vm-install-0.3.17/po/es.po
--- old/vm-install-0.3.16/po/es.po 2008-11-19 00:06:53.000000000 +0100
+++ new/vm-install-0.3.17/po/es.po 2008-11-26 21:17:44.000000000 +0100
@@ -1,21 +1,22 @@
-# translation of xen-vm-install.po to castellano
+# translation of xen-vm-install.es.po to Spanish
# Camaleón, 2007.
# César Sánchez Alonso , 2007.
# Lluis Martinez , 2008.
# Luis Martinez , 2008.
+# Carlos E. Robinson , 2008.
msgid ""
msgstr ""
-"Project-Id-Version: xen-vm-install\n"
+"Project-Id-Version: xen-vm-install.es\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-08-22 09:29-0600\n"
-"PO-Revision-Date: 2008-09-20 14:57+0200\n"
+"PO-Revision-Date: 2008-11-23 02:21+0100\n"
"Last-Translator: Luis Martinez \n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: src/vminstall/msg.py:22
msgid "Installation Error"
@@ -663,7 +664,6 @@
msgstr "No se puede leer el archivo pxelinux.cfg/default desde el servidor pxe."
#: src/vminstall/msg.py:232
-#, fuzzy
msgid "Can't download the kernel and initrd from the server."
msgstr "No se puede descargar el kernel y initrd desde el servidor."
@@ -672,14 +672,12 @@
msgstr "Esta imagen del kernel puede no ser un xen kernel paravirtualizado como se requiere para la instalación, ¿Continuar?"
#: src/vminstall/msg.py:236
-#, fuzzy
msgid "Fully Virtualized Intel e100"
-msgstr "Realtek 8139 (virtualización completa)"
+msgstr "Intel e100 (virtualización completa)"
#: src/vminstall/msg.py:237
-#, fuzzy
msgid "Fully Virtualized Intel e1000"
-msgstr "Realtek 8139 (virtualización completa)"
+msgstr "Intel e1000 (virtualización completa)"
#: src/vminstall/msg.py:238
msgid "Fully Virtualized AMD PCnet 32"
@@ -836,3 +834,4 @@
#: src/vminstall/msg.py:283
msgid "Default"
msgstr "Por defecto"
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.16/po/hu.po new/vm-install-0.3.17/po/hu.po
--- old/vm-install-0.3.16/po/hu.po 2008-11-19 00:06:48.000000000 +0100
+++ new/vm-install-0.3.17/po/hu.po 2008-12-03 22:47:22.000000000 +0100
@@ -1,4 +1,3 @@
-# translation of xen-vm-install.hu.po to Hungarian
# translation of xen-vm-install.hu.po to
# translation of xen-vm-install.po to
# Copyright (C) YEAR Novell, Inc.
@@ -10,14 +9,14 @@
"Project-Id-Version: xen-vm-install.hu\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-08-22 09:29-0600\n"
-"PO-Revision-Date: 2008-11-17 10:49+0100\n"
+"PO-Revision-Date: 2008-12-03 21:44+0100\n"
"Last-Translator: Kalman Kemenczy \n"
-"Language-Team: Hungarian \n"
+"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: src/vminstall/msg.py:22
msgid "Installation Error"
@@ -506,7 +505,7 @@
#: src/vminstall/msg.py:180
msgid "The <b>type of operating system</b> that will run in the new VM"
-msgstr "Az <b>operációs rendszer típusa</b> amely az új virtuális gépben futni fog"
+msgstr "Az <b>operációs rendszer típusa</b>, amely az új virtuális gépben futni fog"
#: src/vminstall/msg.py:181
msgid "Whether the VM will be <b>fully virtualized</b> or <b>paravirtualized</b>"
@@ -518,7 +517,7 @@
#: src/vminstall/msg.py:183
msgid "Other characteristics of the VM, such as <b>memory</b>, <b>processors</b>, and <b>network adapters</b>."
-msgstr "A virtuális gép egyéb tulajdonsága, mint a <b>memória</b>, <b>processzorok</b>, és <b>hálózati csatolók</b>."
+msgstr "A virtuális gép egyéb tulajdonságai, mint a <b>memória</b>, <b>processzorok</b>, és <b>hálózati csatolók</b>."
#. TRANSLATORS Do not translate %(url)s
#: src/vminstall/msg.py:185
@@ -528,7 +527,7 @@
#: src/vminstall/msg.py:186
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 "Ha a virtuális gépet alapjaitól építi fel, akkor telepítenie kell operációs rendszert. Amennyiben egy fizikai gépet virtuális géppé migrál, a lemez, amelyen a meglévő operációs rendszer van általában újra felhasználható a virtuális gép számára."
+msgstr "Ha a virtuális gépet alapjaitól építi fel, akkor telepítenie kell operációs rendszert. Amennyiben egy fizikai gépet virtuális géppé migrál, a lemez, amelyen a meglévő operációs rendszer van, általában újra felhasználható a virtuális gép számára."
#: src/vminstall/msg.py:187
msgid "I need to install an operating system."
@@ -544,11 +543,11 @@
#: src/vminstall/msg.py:190
msgid "Click any headline to make changes. When the settings are correct, click <b>OK</b> to create the VM."
-msgstr "Módosításhoz kattintson bármelyik címre. Amennyiben a beállítások helyesek a virtuális gép létrehozásához kattintson az <b>OK</b> gombra."
+msgstr "Módosításhoz kattintson bármelyik címre. Amennyiben a beállítások helyesek, a virtuális gép létrehozásához kattintson az <b>OK</b> gombra."
#: src/vminstall/msg.py:191
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 "A virtuális gép használhat paravirtualizációt vagy teljes virtualizációt. A paravirtualizáció gyorsabb de a virtuális gépben futó operációs rendszer támogatását igényli. A teljes virtualizáció az operációs rendszerek szélesebb körében használható, de hardvertámogatást igényel. Melyiket választja?"
+msgstr "A virtuális gép használhat paravirtualizációt vagy teljes virtualizációt. A paravirtualizáció gyorsabb, de a virtuális gépben futó operációs rendszer támogatását igényli. A teljes virtualizáció az operációs rendszerek szélesebb körében használható, de hardvertámogatást igényel. Melyiket választja?"
#: src/vminstall/msg.py:192
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."
@@ -560,15 +559,15 @@
#: src/vminstall/msg.py:194
msgid "Some operating systems accept additional arguments, used to customize the installation or boot process."
-msgstr "Néhány operációs rendszer támogatja további paraméterek megadását, amelynek segítségével testre szabható a telepítés vagy a betöltés folyamata."
+msgstr "Néhány operációs rendszer támogatja további paraméterek megadását, amelyek segítségével testre szabható a telepítés vagy a betöltés folyamata."
#: src/vminstall/msg.py:195
msgid "Select the behavior when the operating system exits with power off, reboot or crash. Settings take effect after installation is complete."
-msgstr "Válassza ki az operációs rendszer viselkedését az operációs rendszer lekapcsolásakor: újraindítás vagy összeomlás. A beállítások csak a telepítés befejezését követően jutnak érvényre."
+msgstr "Adja meg, hogyan viselkedjen a rendszer a gép kikapcsolása, újraindítása, illetve összeomlása esetén. A beállítások csak a telepítés befejezését követően jutnak érvényre."
#: src/vminstall/msg.py:198
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 "Adja meg az indítható virtuális lemezt (ez általában a Disk 1) vagy a hálózaton keresztül elérhető telepítési forrás URL-jét. Minden a telepítéshez szükséges CD, DVD vagy ISO lemezképet virtuális lemezként hozzá kell adni."
+msgstr "Adja meg az indítható virtuális lemezt (ez általában a Disk 1) vagy a hálózaton keresztül elérhető telepítési forrás URL-jét. Minden, a telepítéshez szükséges CD, DVD vagy ISO lemezképet virtuális lemezként hozzá kell adni."
#: src/vminstall/msg.py:201
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."
@@ -580,7 +579,7 @@
#: src/vminstall/msg.py:205
msgid "Specify the amount of memory and number of processors to allocate for the VM."
-msgstr "Adja meg a virtuális gép számára lefoglalt memória mennyiségét és processzorok számát."
+msgstr "Adja meg a virtuális gép számára lefoglalt memória mennyiségét és a processzorok számát."
#: src/vminstall/msg.py:206
msgid "For best performance, the number of virtual processors should be less than or equal to the number of physical processors."
@@ -592,7 +591,7 @@
#: src/vminstall/msg.py:210
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 "A virtuális gép úgy működik, mint egy monitor nélküli kiszolgáló. Lehetőség van az operációs rendszer eléréséhez a virtuális soros porton vagy bármely operációs rendszer által támogatott szolgáltatáson keresztül, mint az ssh vagy a VNC."
+msgstr "A virtuális gép úgy működik, mint egy monitor nélküli kiszolgáló. Lehetőség van az operációs rendszer elérésére a virtuális soros porton vagy bármely operációs rendszer által támogatott szolgáltatáson keresztül, mint az ssh vagy a VNC."
#: src/vminstall/msg.py:211
msgid "Please specify the type of virtualized graphics hardware."
@@ -652,7 +651,7 @@
#: src/vminstall/msg.py:230
msgid "Can't reach the pxe server. Possible reasons are an improperly configured network, SuSEfirewall2 or iptables -L"
-msgstr "A PXE-kiszolgáló nem érhető el. Lehetséges, hogy a hálózat a SuSEfirewall2 vagy az iptables -L nincs megfelelően beállítva"
+msgstr "A PXE-kiszolgáló nem érhető el. Lehetséges, hogy a hálózat, a SuSEfirewall2 vagy az iptables -L nincs megfelelően beállítva"
#: src/vminstall/msg.py:231
msgid "Can't get the pxelinux.cfg/default file from the pxe server."
@@ -692,15 +691,15 @@
#: src/vminstall/msg.py:242
msgid "MAC Address"
-msgstr "MAC cím"
+msgstr "MAC-cím"
#: src/vminstall/msg.py:243
msgid "Randomly generated MAC address"
-msgstr "Véletlenszerűen generált MAC cím"
+msgstr "Véletlenszerűen generált MAC-cím"
#: src/vminstall/msg.py:244
msgid "Specified MAC address"
-msgstr "Megadott MAC cím"
+msgstr "Megadott MAC-cím"
#: src/vminstall/msg.py:247
msgid "Additional Arguments"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.16/po/ru.po new/vm-install-0.3.17/po/ru.po
--- old/vm-install-0.3.16/po/ru.po 2008-11-19 00:06:31.000000000 +0100
+++ new/vm-install-0.3.17/po/ru.po 2008-12-01 18:48:08.000000000 +0100
@@ -9,14 +9,14 @@
"Project-Id-Version: xen-vm-install.ru\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-08-22 09:29-0600\n"
-"PO-Revision-Date: 2008-11-12 12:11+0300\n"
+"PO-Revision-Date: 2008-11-21 13:45+0300\n"
"Last-Translator: Alexander Melentiev \n"
"Language-Team: Russian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 0.3\n"
+"X-Generator: Lokalize 0.2\n"
#: src/vminstall/msg.py:22
msgid "Installation Error"
@@ -659,7 +659,6 @@
msgstr "Невозможно получить pxelinux.cfg/файл по умолчанию с сервера pxe."
#: src/vminstall/msg.py:232
-#, fuzzy
msgid "Can't download the kernel and initrd from the server."
msgstr "Невозможно загрузить ядро и initrd с сервера."
@@ -668,14 +667,12 @@
msgstr "Этот образ ядра может не быть параиртуализованным ядром xen, необходимым для установки. Продолжить?"
#: src/vminstall/msg.py:236
-#, fuzzy
msgid "Fully Virtualized Intel e100"
-msgstr "Полностью виртуализованный Realtek 8139"
+msgstr "Полностью виртуализованный Intel e100"
#: src/vminstall/msg.py:237
-#, fuzzy
msgid "Fully Virtualized Intel e1000"
-msgstr "Полностью виртуализованный Realtek 8139"
+msgstr "Полностью виртуализованный Intel e1000"
#: src/vminstall/msg.py:238
msgid "Fully Virtualized AMD PCnet 32"
@@ -826,3 +823,4 @@
#: src/vminstall/msg.py:283
msgid "Default"
msgstr "По умолчанию"
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.16/po/zh_CN.po new/vm-install-0.3.17/po/zh_CN.po
--- old/vm-install-0.3.16/po/zh_CN.po 2008-11-19 00:06:52.000000000 +0100
+++ new/vm-install-0.3.17/po/zh_CN.po 2008-12-01 18:48:49.000000000 +0100
@@ -1,6 +1,6 @@
# @TITLE@
# Copyright (C) 2006, SUSE Linux GmbH, Nuremberg
-# Eric Shan , 2008.
+# Eric Shan , 2008.
#
# This file is distributed under the same license as @PACKAGE@ package. FIRST
#
@@ -9,8 +9,8 @@
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-08-22 09:29-0600\n"
-"PO-Revision-Date: 2008-04-21 13:09+0800\n"
-"Last-Translator: Eric Shan \n"
+"PO-Revision-Date: 2008-12-01 01:52+0800\n"
+"Last-Translator: Thruth Wang \n"
"Language-Team: Simplified Chinese\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -201,7 +201,7 @@
#: src/vminstall/msg.py:88
msgid "Not enough space on device for disk image."
-msgstr ""
+msgstr "设备上空间不足以使用磁盘镜像。"
#: src/vminstall/msg.py:91
msgid "The job was canceled."
@@ -272,9 +272,8 @@
msgstr "openSUSE"
#: src/vminstall/msg.py:114
-#, fuzzy
msgid "openSUSE 11"
-msgstr "openSUSE"
+msgstr "openSUSE 11"
#: src/vminstall/msg.py:115
msgid "Other operating system"
@@ -301,18 +300,16 @@
msgstr "SUSE Linux Enterprise Desktop 10"
#: src/vminstall/msg.py:121
-#, fuzzy
msgid "SUSE Linux Enterprise Desktop 11"
-msgstr "SUSE Linux Enterprise Desktop 10"
+msgstr "SUSE Linux Enterprise Desktop 11"
#: src/vminstall/msg.py:122
msgid "SUSE Linux Enterprise Server 10"
msgstr "SUSE Linux Enterprise Server 10"
#: src/vminstall/msg.py:123
-#, fuzzy
msgid "SUSE Linux Enterprise Server 11"
-msgstr "SUSE Linux Enterprise Server 10"
+msgstr "SUSE Linux Enterprise Server 11"
#: src/vminstall/msg.py:124
msgid "SUSE Linux Enterprise Server 8"
@@ -399,9 +396,8 @@
msgstr "正在创建运行时配置..."
#: src/vminstall/msg.py:147
-#, fuzzy
msgid "The configuration file has been written."
-msgstr "配置未初始化。"
+msgstr "配置文件已写入。"
#: src/vminstall/msg.py:148
msgid "Finishing the installation..."
@@ -440,9 +436,8 @@
msgstr "源"
#: src/vminstall/msg.py:159
-#, fuzzy
msgid "Protocol"
-msgstr "协议错误"
+msgstr "协议"
#: src/vminstall/msg.py:160
msgid "None"
@@ -485,7 +480,8 @@
msgid "Disks"
msgstr "磁盘"
-#: src/vminstall/msg.py:172 src/vminstall/msg.py:218
+#: src/vminstall/msg.py:172
+#: src/vminstall/msg.py:218
msgid "Virtual Disk"
msgstr "虚拟磁盘"
@@ -666,21 +662,19 @@
#: src/vminstall/msg.py:232
msgid "Can't download the kernel and initrd from the server."
-msgstr ""
+msgstr "无法从服务器下载内核和 initrd 。"
#: src/vminstall/msg.py:233
msgid "This kernel image may not be a paravirtualized xen kernel required for installation, Continue?"
msgstr ""
#: src/vminstall/msg.py:236
-#, fuzzy
msgid "Fully Virtualized Intel e100"
-msgstr "全虚拟化 Realtek 8139"
+msgstr "全虚拟化 Intel e100"
#: src/vminstall/msg.py:237
-#, fuzzy
msgid "Fully Virtualized Intel e1000"
-msgstr "全虚拟化 Realtek 8139"
+msgstr "全虚拟化 Intel e100"
#: src/vminstall/msg.py:238
msgid "Fully Virtualized AMD PCnet 32"
@@ -774,7 +768,7 @@
#: src/vminstall/msg.py:262
msgid "Crash"
-msgstr ""
+msgstr "崩溃"
#: src/vminstall/msg.py:265
msgid "Kickstart file or URL"
@@ -793,9 +787,8 @@
msgstr "正在创建虚拟机"
#: src/vminstall/msg.py:271
-#, fuzzy
msgid "Writing the configuration file"
-msgstr "正在分析配置文件..."
+msgstr "正在写入配置文件"
#: src/vminstall/msg.py:272
msgid "Locate Operating System Settings File"
@@ -834,3 +827,4 @@
#: src/vminstall/msg.py:283
msgid "Default"
msgstr "默认值"
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.16/setup.py new/vm-install-0.3.17/setup.py
--- old/vm-install-0.3.16/setup.py 2008-11-20 23:36:59.000000000 +0100
+++ new/vm-install-0.3.17/setup.py 2008-12-03 22:47:17.000000000 +0100
@@ -1,7 +1,7 @@
from distutils.core import setup
setup(name='vminstall',
- version='0.3.16',
+ version='0.3.17',
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.3.16/src/vminstall/console.py new/vm-install-0.3.17/src/vminstall/console.py
--- old/vm-install-0.3.16/src/vminstall/console.py 2008-11-20 22:11:20.000000000 +0100
+++ new/vm-install-0.3.17/src/vminstall/console.py 2008-12-03 22:47:16.000000000 +0100
@@ -68,6 +68,9 @@
for domid in domids:
path = t.read('%s/vm' % domid)
if path == vm_path:
+ d = t.read('%s/domid' % domid)
+ if d == 'None':
+ continue
domid = int(domid)
log.debug("Domain %s has ID %d" % (uuid, domid))
t.abort()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.16/src/vminstall/gtk/interface.py new/vm-install-0.3.17/src/vminstall/gtk/interface.py
--- old/vm-install-0.3.16/src/vminstall/gtk/interface.py 2008-11-20 22:11:20.000000000 +0100
+++ new/vm-install-0.3.17/src/vminstall/gtk/interface.py 2008-12-03 22:47:16.000000000 +0100
@@ -453,6 +453,7 @@
combo=self.window.get_widget('pv-src-pxe-box')
combo.show()
saved_os_type = self.options.os_type
+ saved_source = self.options.source
self.original_os_type = self.options.os_type
self.options.os_type='pxe'
self.options.source='pxe'
@@ -462,6 +463,7 @@
except Exception, e:
self._exc_box(e)
self.options.os_type=saved_os_type
+ self.options.source=saved_source
self.original_os_type = None
return
src = [str(label) for label in kernel]
@@ -520,7 +522,8 @@
if self.defaults.pxe_boot:
src = vminstall.msg.PXE_boot
if self.options.source:
- src = strify(self.options.source)
+ if not self.defaults.pxe_boot and not self.defaults.full_virt:
+ src = strify(self.options.source)
self.summary.get_widget("summary-install-source").set_text(src)
show_row(src_row)
if self.defaults.full_virt:
@@ -1284,8 +1287,11 @@
if i < 0:
raise vminstall.DiskResourceError(vminstall.DiskResourceError.E_NOT_FOUND)
src = self.src_disks[i]
+ self.options.pxe_boot = False
elif self.window.get_widget("pv-src-network").get_active():
src = self.window.get_widget('pv-src-network-url').get_active_text()
+ self.options.pxe_boot = False
+ self.options._install_args = src
else:
src = None
combo=self.window.get_widget('pv-src-pxe-box')
@@ -1295,8 +1301,6 @@
action = VMDefaults[self.options.os_type].actions()
kernel = action.getKernelList()
src = labelN+' '+kernel[labelN]
- if (src.find('xen') == -1) and (src.find('pv') == -1):
- self._error_box('WARNING:', msg.pxe_kernel_warn)
self.options.pxe_label = labelN
self.defaults.pxe_label = labelN
self.options.source = src
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.16/src/vminstall/util.py new/vm-install-0.3.17/src/vminstall/util.py
--- old/vm-install-0.3.16/src/vminstall/util.py 2008-11-20 22:11:20.000000000 +0100
+++ new/vm-install-0.3.17/src/vminstall/util.py 2008-12-03 22:47:16.000000000 +0100
@@ -214,7 +214,10 @@
if line.startswith('RepoURL:'):
repo_url = line[:-1].split('?', 1)[0]
repo_url = repo_url.split(' ')
- return repo_url[1]
+ if repo_url[1]:
+ if repo_url[1].startswith('ftp:') or repo_url[1].startswith('http:') or repo_url[1].startswith('smb:') or repo_url[1].startswith('nfs:'):
+ return repo_url[1]
+ return None
elif line.startswith('InstMode:'):
inst_mode = line[:-1].split('?', 1)[0]
inst_mode = inst_mode.split(' ')
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.16/src/vminstall/VMDefaults.py new/vm-install-0.3.17/src/vminstall/VMDefaults.py
--- old/vm-install-0.3.16/src/vminstall/VMDefaults.py 2008-11-20 22:11:20.000000000 +0100
+++ new/vm-install-0.3.17/src/vminstall/VMDefaults.py 2008-12-03 22:47:16.000000000 +0100
@@ -383,7 +383,7 @@
def default_memory(self):
return 1024
def _disk_size(self):
- return 20
+ return 30
def disks(self):
return [ self._disk_template(0, self._disk_size()) ]
def num_vcpus(self):
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.16/src/vminstall/VMPXE.py new/vm-install-0.3.17/src/vminstall/VMPXE.py
--- old/vm-install-0.3.16/src/vminstall/VMPXE.py 2008-11-20 22:11:20.000000000 +0100
+++ new/vm-install-0.3.17/src/vminstall/VMPXE.py 2008-12-03 22:47:16.000000000 +0100
@@ -45,24 +45,27 @@
#Can't use dhclient, which will make network unstable
#FIXME 1: is there any better method to get the dhcp server IP
#which doesn't effect network status
- #This method depend on udhcp-0.9.8-2usemac
+ #This method depend on udhcp-0.9.8-2
#udhcpc_command="/usr/bin/udhcpc"
udhcpc_command="/sbin/udhcpc"
udhcpc_script="/usr/share/udhcpc/outputpy.udhcp.sh"
- macraw = [ 0x00, 0x16, 0x3e, random.randint(0x00, 0x7f),
- random.randint(0x00, 0xff), random.randint(0x00, 0xff) ]
- mac = ':'.join(map(lambda x: "%02x" % x, macraw))
nics = options.nics
if (nics is not None and nics[0].bridge is not None):
- log.debug("getServAddr: bridge: %s" % (nics,))
- udhcp_result=commands.getstatusoutput(udhcpc_command +
- " -i " + nics[0].bridge +
- " -n -q -s " + udhcpc_script +
- " -M " + mac)
+ bridge = nics[0].bridge
else:
- udhcp_result=commands.getstatusoutput(udhcpc_command +
- " -n -q -s " + udhcpc_script +
- " -M "+mac)
+ rfd = os.popen("brctl show")
+ data = rfd.read()
+ status = rfd.close()
+ lines = data.splitlines()[1:]
+ line1 = lines[0]
+ words = line1.split()
+ bridge = words[0]
+
+ log.debug("getServAddr: bridge: %s " % (bridge))
+ udhcp_result=commands.getstatusoutput(udhcpc_command +
+ " -i " + bridge +
+ " -n -q -s " + udhcpc_script)
+
if (udhcp_result[0] != 0):
raise PXEError(PXEError.E_NO_SERVER)
udhcplines=udhcp_result[1].split('\n')
@@ -90,11 +93,98 @@
kernel_list={}
initrd_list={}
- def getInstallImagesFromPath(self, root, progress=lambda f:None, supports_32nonpae=True):
- """
- ON PXE, use the getInstallImagesFromUrl()
+ def _getMediaRoots(self, root, _open=open):
+ """Network install sources may be composed of multiple CDs. YaST lists
+ their location and ordering in ./yast/instorder. Potentially any of
+ these CDs may contain a PV kernel.
"""
- return getInstallImagesFromUrl()
+ roots = ['.']
+ try:
+ fd = _open('%s/yast/instorder' % root)
+ try:
+ roots = fd.readlines()
+ roots = map(lambda s: s.strip(), roots)
+ finally:
+ fd.close()
+ finally:
+ log.debug("Media roots: %s" % str(roots))
+ return roots
+
+ def getInstallImagesFromPath(self, url, progress=lambda f:None, supports_32nonpae=True):
+ """Retrieves a Xen-enabled SUSE kernel and initrd from the URL, and
+ copies them to temporary files. Returns the (kernel, initrd) tuple of
+ filenames."""
+ ftp = url.startswith('ftp://')
+ http = url.startswith('http://')
+ nfs = url.startswith('nfs://')
+ smb = url.startswith('smb://')
+ if nfs or smb:
+ import urlparse
+ # NOTE: Python's urlparse module does not recognize nfs or smb,
+ # but the code handles it okay. Add support:
+ urlparse.uses_netloc.extend(['nfs', 'smb'])
+ (_, host, path, _, _, _) = urlparse.urlparse(url)
+ host = host.strip(':')
+ if nfs:
+ mnt = mount.TemporaryNFSMount(host, path)
+ else:
+ mnt = mount.TemporarySMBMount(host, path)
+ base = mnt.mount()
+ urlopen = lambda path: open(path)
+ elif ftp or http:
+ base = url
+ urlopen = lambda path: grabber.urlopen(path)
+ else:
+ # This should never happen (unless VMDefaults are out of sync?)
+ raise InstSrcError(err=InstSrcError.E_UNSUPPORTED, details=url)
+ progress(0.1)
+
+ arches = caps.compatible_arches(supports_32nonpae)
+ for mediaroot in self._getMediaRoots(base, urlopen):
+ for a in arches:
+ try:
+ kfn = '/%s/boot/%s/vmlinuz-xen' % (mediaroot, a[0])
+ ifn = '/%s/boot/%s/initrd-xen' % (mediaroot, a[0])
+ log.debug("Checking for %s..." % (base+kfn,))
+ kfd = urlopen(base + kfn)
+ self.kfn = util.copy_to_temp(kfd, prefix='kernel.', progress=lambda f:progress(0.1+f*0.45))
+ kfd.close()
+ die_zero(self.kfn)
+ ifd = urlopen(base + ifn)
+ self.ifn = util.copy_to_temp(ifd, prefix='install-initrd.', progress=lambda f:progress(0.55+f*0.45))
+ ifd.close()
+ die_zero(self.kfn)
+ log.debug("Unpacked kernel/initrd found: %s %s" % (kfn, ifn))
+ return (self.kfn, self.ifn)
+ except:
+ continue
+
+ log.debug("No unpacked kernel/initrd found")
+ try:
+ for a in arches:
+ kurl = '/boot/%s/vmlinuz-xen' % (a[0])
+ log.debug("URL of kernel is %s" % kurl)
+ url = base + kurl
+ kfd = urlopen(url)
+ self.kfn = util.copy_to_temp(kfd, prefix='kernel.')
+ kfd.close()
+ progress(0.15)
+
+ iurl = '/boot/%s/initrd-xen' % (a[0])
+ log.debug("URL of initrd is %s" % iurl)
+ url = base + iurl
+ ifd = urlopen(url)
+ self.ifn = util.copy_to_temp(ifd, prefix='install-initrd.')
+ ifd.close()
+ log.debug("Got installation kernel/initrd: %s %s" % (self.kfn, self.ifn))
+ return (self.kfn, self.ifn)
+ except grabber.URLGrabError, e:
+ raise InstSrcError(urlgrabber=e.errno, details='%s\n%s' % (url, e.strerror))
+ except Error, e:
+ raise
+ except Exception, e:
+ raise InstSrcError(err=InstSrcError.E_BAD, details='%s\n%s' % (url, str(e)))
+ progress(0.2)
def getPXEconfigFromPXEserver(self, options):
try:
@@ -136,14 +226,13 @@
cfgfile.close()
return kernel_list
- def _getImageFromInstallArgs(self, options):
- #If not successful when get vmlinuz-xen initrd-xen from pxe-server:/tftpboot/,
- #we could get vmlinuz-xen/initrd-xen from the INSTALL way
- #which has been saved in getInstallArgs():/boot/{%arch}/vmlinuz-xen
- #FIXME 2:prase options._install_args
- return PXEError(PXEError.E_NO_KERNEL)
-
def getInstallImagesFromUrl(self, options, url, progress=lambda f:None, supports_32nonpae=True):
+ if url:
+ log.debug("Source:%s" % (url))
+ (self.kfn, self.ifn) = self.getInstallImagesFromPath(url, progress, True)
+ if self.kfn and self.ifn:
+ return (self.kfn, self.ifn)
+
try:
servaddr=getServAddr(options)
except Exception, e:
@@ -156,7 +245,7 @@
#cmd="tftp 147.2.207.153 -c get "+ i #for test
dlres[i]=commands.getstatusoutput(cmd)
if not tftp_success (dlres[i]):
- return _getImageFromInstallArgs(self, options)
+ raise PXEError(PXEError.E_NO_KERNEL)
self.kfn = vminstall.paths.imagedir+os.path.basename(kernel_list[options.pxe_label])+"."+str(os.getpid())
self.ifn = vminstall.paths.imagedir+os.path.basename(initrd_list[options.pxe_label])+"."+str(os.getpid())
log.debug("Installation kernel/initrd: %s %s" % (self.kfn, self.ifn))
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org