Hello community,
here is the log from the commit of package vm-install
checked in at Sat May 10 01:52:19 CEST 2008.
--------
--- vm-install/vm-install.changes 2008-04-30 21:09:23.000000000 +0200
+++ vm-install/vm-install.changes 2008-05-09 01:08:50.625055000 +0200
@@ -1,0 +2,9 @@
+Thu May 8 17:04:59 MDT 2008 - carnold@novell.com
+
+- bnc#363671 - XEN: problems with i386 hvm
+- bnc#380514 - can't install SLED10-SP1. Reverted back to file
+ until problem with tap:aio is resolved.
+- Fixed problem looking up xenpae kernel on SLE11. xenpae was
+ renamed to just xen.
+
+-------------------------------------------------------------------
Old:
----
vm-install-0.2.7.tar.bz2
New:
----
vm-install-0.2.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vm-install.spec ++++++
--- /var/tmp/diff_new_pack.Dw6140/_old 2008-05-10 01:46:54.000000000 +0200
+++ /var/tmp/diff_new_pack.Dw6140/_new 2008-05-10 01:46:54.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package vm-install (Version 0.2.7)
+# spec file for package vm-install (Version 0.2.8)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -19,10 +19,10 @@
License: GPL v2 or later
Group: System/Emulators/PC
AutoReqProv: yes
-Version: 0.2.7
+Version: 0.2.8
Release: 1
Summary: Tool to Define a Virtual Machine and Install Its Operating System
-Source0: %{name}-0.2.7.tar.bz2
+Source0: %{name}-0.2.8.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: xen-tools python-urlgrabber libxml2-python
%define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()")
@@ -78,6 +78,12 @@
%{_datadir}/applications/YaST2/vm-install.desktop
%changelog
+* Thu May 08 2008 carnold@novell.com
+- bnc#363671 - XEN: problems with i386 hvm
+- bnc#380514 - can't install SLED10-SP1. Reverted back to file
+ until problem with tap:aio is resolved.
+- Fixed problem looking up xenpae kernel on SLE11. xenpae was
+ renamed to just xen.
* Wed Apr 30 2008 carnold@novell.com
- Add keymap support during vm creation - Pat Campbell addition.
* Fri Apr 25 2008 carnold@novell.com
++++++ vm-install-0.2.7.tar.bz2 -> vm-install-0.2.8.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.7/Makefile new/vm-install-0.2.8/Makefile
--- old/vm-install-0.2.7/Makefile 2008-04-30 20:51:11.000000000 +0200
+++ new/vm-install-0.2.8/Makefile 2008-05-07 21:47:14.000000000 +0200
@@ -1,8 +1,8 @@
PACKAGE = vm-install
-VER = 0.2.7
+VER = 0.2.8
default:
- echo "Run 'make install DESTDIR=$destdir' to install."
+ @echo "Run 'make install DESTDIR=$destdir' to install."
INSTALL = install
MSGMERGE = msgmerge -v
@@ -48,6 +48,7 @@
dist:
mkdir -p dist/$(PACKAGE)-$(VER)
+ mkdir -p package
for x in * ; do [ "$$x" != "dist" -a "$$x" != "package" ] && cp -a $$x dist/$(PACKAGE)-$(VER) ; done
find dist/$(PACKAGE)-$(VER) -type d -name .svn -print | while read d ; do rm -rf $$d ; done
find dist/$(PACKAGE)-$(VER) -name "*~" -exec rm \{\} \;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.7/po/de.po new/vm-install-0.2.8/po/de.po
--- old/vm-install-0.2.7/po/de.po 2008-04-25 16:08:47.000000000 +0200
+++ new/vm-install-0.2.8/po/de.po 2008-05-08 22:19:42.000000000 +0200
@@ -5,7 +5,7 @@
"Project-Id-Version: xen-vm-install.de\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-04-16 15:42-0600\n"
-"PO-Revision-Date: 2008-04-19 13:04+0200\n"
+"PO-Revision-Date: 2008-04-27 23:42+0200\n"
"Last-Translator: Michael Skiba \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
@@ -511,7 +511,7 @@
#: src/vminstall/msg.py:183
msgid "I have a disk or disk image with an installed operating system."
-msgstr "I habe eine Platte oder ein CD Image mit einem installierten Betriebssystem."
+msgstr "Ich habe eine Festplatte oder ein Festplatten-Abbild mit einem installierten Betriebssystem."
#: src/vminstall/msg.py:184
msgid "Please choose a name for the virtual machine."
@@ -599,7 +599,7 @@
#: src/vminstall/msg.py:216
msgid "Create Sparse Image File"
-msgstr "Erzeuge gesplittete Image Datei"
+msgstr "Erzeuge gesplittete Abbild-Datei"
#: src/vminstall/msg.py:217
msgid "Read-Only Access"
@@ -725,7 +725,7 @@
#: src/vminstall/msg.py:255
msgid "Locate Disk or Disk Image"
-msgstr "Sucher Platte oder Disk Image"
+msgstr "Suche Festplatte oder Festplatten-Abbild"
# power-off message
#: src/vminstall/msg.py:258
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.7/po/fi.po new/vm-install-0.2.8/po/fi.po
--- old/vm-install-0.2.7/po/fi.po 2008-04-25 16:06:46.000000000 +0200
+++ new/vm-install-0.2.8/po/fi.po 2008-05-08 22:18:33.000000000 +0200
@@ -1,18 +1,20 @@
-# translation of xen-vm-install.po to Suomi
+# translation of xen-vm-install.po to
# Jyri Palokangas , 2007.
+# Jyri Palokangas , 2008.
+# Mikko Piippo , 2008.
msgid ""
msgstr ""
"Project-Id-Version: xen-vm-install\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-04-16 15:42-0600\n"
-"PO-Revision-Date: 2007-09-12 21:37+0300\n"
-"Last-Translator: Jyri Palokangas \n"
-"Language-Team: Suomi \n"
+"PO-Revision-Date: 2008-05-07 08:57+0300\n"
+"Last-Translator: Mikko Piippo \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: nplurals=2; plural=n != 1;\n"
#: src/vminstall/msg.py:22
msgid "Installation Error"
@@ -32,7 +34,7 @@
#: src/vminstall/msg.py:26
msgid "The 'kernel-xen' and 'install-initrd' packages were not found."
-msgstr "'kernel-xen' ja 'install-initrd' paketteja ei löytynyt."
+msgstr "'kernel-xen' ja 'install-initrd' -paketteja ei löytynyt."
#. TRANSLATORS Do not translate %(tag)s
#: src/vminstall/msg.py:28
@@ -142,7 +144,7 @@
#: src/vminstall/msg.py:68
msgid "The installation source is using an unsupported protocol."
-msgstr "Asennuslähde käyttää protokollaa, jota ei tueta."
+msgstr "Asennuslähde käyttää yhteyskäytäntöä, jota ei tueta."
#: src/vminstall/msg.py:69
msgid "An error occurred while reading from the installation source."
@@ -590,7 +592,7 @@
#: src/vminstall/msg.py:214
msgid "PXE Boot"
-msgstr ""
+msgstr "PXE käynnistys"
#: src/vminstall/msg.py:215
msgid "Size (GB)"
@@ -619,7 +621,7 @@
#: src/vminstall/msg.py:221
msgid "PXE"
-msgstr ""
+msgstr "PXE"
#: src/vminstall/msg.py:224
msgid "Fully Virtualized AMD PCnet 32"
@@ -750,3 +752,4 @@
#: src/vminstall/msg.py:264
msgid "Default"
msgstr "Oletus"
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.7/po/hu.po new/vm-install-0.2.8/po/hu.po
--- old/vm-install-0.2.7/po/hu.po 2008-04-25 16:09:32.000000000 +0200
+++ new/vm-install-0.2.8/po/hu.po 2008-05-08 22:20:04.000000000 +0200
@@ -6,17 +6,17 @@
# Kalman Kemenczy , 2007, 2008.
msgid ""
msgstr ""
-"Project-Id-Version: xen-vm-install.hu\n"
+"Project-Id-Version: xen-vm-install\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-04-16 15:42-0600\n"
-"PO-Revision-Date: 2008-04-21 09:15+0200\n"
+"PO-Revision-Date: 2008-05-01 14:58+0200\n"
"Last-Translator: Kalman Kemenczy \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"
@@ -365,7 +365,7 @@
#: src/vminstall/msg.py:140
msgid "Please wait..."
-msgstr "Kérem várjon..."
+msgstr "Kérem, várjon..."
#: src/vminstall/msg.py:141
msgid "Waiting for the VM to stop before continuing..."
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.7/po/it.po new/vm-install-0.2.8/po/it.po
--- old/vm-install-0.2.7/po/it.po 2008-04-25 16:10:52.000000000 +0200
+++ new/vm-install-0.2.8/po/it.po 2008-05-08 22:20:49.000000000 +0200
@@ -3,7 +3,7 @@
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-04-16 15:42-0600\n"
-"PO-Revision-Date: 2007-08-09 19:16+0100\n"
+"PO-Revision-Date: 2008-04-26 14:46-0600\n"
"Last-Translator: Alberto Passalacqua \n"
"Language-Team: Novell Language \n"
"MIME-Version: 1.0\n"
@@ -451,7 +451,8 @@
msgid "Disks"
msgstr "Dischi"
-#: src/vminstall/msg.py:167 src/vminstall/msg.py:212
+#: src/vminstall/msg.py:167
+#: src/vminstall/msg.py:212
msgid "Virtual Disk"
msgstr "Disco virtuale"
@@ -588,7 +589,7 @@
#: src/vminstall/msg.py:214
msgid "PXE Boot"
-msgstr ""
+msgstr "Boot PXE"
#: src/vminstall/msg.py:215
msgid "Size (GB)"
@@ -617,7 +618,7 @@
#: src/vminstall/msg.py:221
msgid "PXE"
-msgstr ""
+msgstr "PXE"
#: src/vminstall/msg.py:224
msgid "Fully Virtualized AMD PCnet 32"
@@ -748,3 +749,4 @@
#: src/vminstall/msg.py:264
msgid "Default"
msgstr "Predefinito"
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.7/po/ko.po new/vm-install-0.2.8/po/ko.po
--- old/vm-install-0.2.7/po/ko.po 2008-04-25 16:08:00.000000000 +0200
+++ new/vm-install-0.2.8/po/ko.po 2008-05-08 22:19:19.000000000 +0200
@@ -1,254 +1,250 @@
msgid ""
msgstr ""
-"Project-Id-Version: entries\n"
+"Project-Id-Version: xen-vm-install.ko\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-04-16 15:42-0600\n"
-"PO-Revision-Date: 2006-06-12 16:56+0100\n"
-"Last-Translator: \n"
-"Language-Team: \n"
+"PO-Revision-Date: 2008-05-04 07:15+0900\n"
+"Last-Translator: YunSeok Choi \n"
+"Language-Team: Korean \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.2\n"
+"X-Poedit-Language: Korean\n"
+"X-Poedit-Country: KOREA, REPUBLIC OF\n"
+"X-Poedit-SourceCharset: utf-8\n"
#: src/vminstall/msg.py:22
msgid "Installation Error"
-msgstr ""
+msgstr "설치 오류"
#: src/vminstall/msg.py:23
msgid "Error"
-msgstr "에러"
+msgstr "오류"
#: src/vminstall/msg.py:24
-#, fuzzy
msgid "Aborted"
-msgstr "&Abort"
+msgstr "중단됨"
#: src/vminstall/msg.py:25
msgid "Invalid URL"
-msgstr ""
+msgstr "잘못된 URL"
#: src/vminstall/msg.py:26
msgid "The 'kernel-xen' and 'install-initrd' packages were not found."
-msgstr ""
+msgstr "'kernel-xen' 과 'install-initrd' 꾸러미가 없습니다."
#. TRANSLATORS Do not translate %(tag)s
#: src/vminstall/msg.py:28
#, python-format
msgid "Failed to find the '%(tag)s' tag in the XML file."
-msgstr ""
+msgstr "XML 파일에서 '%(tag)s' 태그를 찾기에 실패했습니다."
#. TRANSLATORS Do not translate %(file)s
#: src/vminstall/msg.py:30
-#, fuzzy, python-format
+#, python-format
msgid "Failed to parse the XML file '%(file)s'."
-msgstr "Failed to parse: %s."
+msgstr "XML 파일 '%(file)s'의 해석에 실패했습니다."
#: src/vminstall/msg.py:31
msgid "The virtual disk may only be stored on a block device or in a file."
-msgstr ""
+msgstr "가상 디스크는 블록 장치나 파일에서 보관만 해주세요."
#: src/vminstall/msg.py:32
msgid "No media is present in the drive."
-msgstr ""
+msgstr "드라이브에 미디어가 없습니다."
#: src/vminstall/msg.py:35
msgid "Please correct the error and try again."
-msgstr ""
+msgstr "오류를 수정하고 재시도 해주세요."
#: src/vminstall/msg.py:36
msgid "Please type a number."
-msgstr ""
+msgstr "숫자를 입력해주세요."
#. TRANSLATORS Do not translate %(val)s
#: src/vminstall/msg.py:38
#, python-format
msgid "The minimum acceptable value is %(val)s."
-msgstr ""
+msgstr "설정 가능한 최소값은 %(val)s 입니다."
#. TRANSLATORS Do not translate %(val)s
#: src/vminstall/msg.py:40
#, python-format
msgid "The maximum acceptable value is %(val)s."
-msgstr ""
+msgstr "설정 가능한 최대값은 %(val)s 입니다."
#: src/vminstall/msg.py:43
msgid "The VM's name must contain only alphanumeric and _ - . : + characters."
-msgstr ""
+msgstr "가상머신 이름은 영숫자와 기호 _ - . : + 만 사용할 수 있습니다."
#: src/vminstall/msg.py:44
msgid "The VM's name must contain from 1 to 255 characters."
-msgstr ""
+msgstr "가상머신 이름은 1 에서 255 개 내의 문자로 해야 합니다."
#: src/vminstall/msg.py:45
msgid "The VM's name cannot start with a digit."
-msgstr ""
+msgstr "가상머신 이름은 첫문자로 숫자를 지정 할 수 없습니다."
#: src/vminstall/msg.py:48
#, python-format
msgid "Failed to display the VM's console because DISPLAY is not set. Please connect a VNC viewer to %s:%d."
-msgstr ""
+msgstr "DISPLAY 환경변수가 설정되어 있지 않아서 가상머신 표시에 실패했습니다. %s의 VNC 뷰어에 연결하세요:%d."
#: src/vminstall/msg.py:49
msgid "Failed to display the VM's console. Please connect a viewer manually."
-msgstr ""
+msgstr "가상머신 콘솔 표시에 실패했습니다. 뷰어에 수동으로 연결하세요."
#: src/vminstall/msg.py:53
msgid "An error occurred in Xen."
-msgstr ""
+msgstr "Xen에 오류가 발생했습니다."
#: src/vminstall/msg.py:54
-#, fuzzy
msgid "The hypervisor is not running."
-msgstr "네트워크 관리자가 실행중이지 않습니다..."
+msgstr "하이퍼바이저가 동작 중입니다."
#: src/vminstall/msg.py:55
msgid "An incompatible version of the hypervisor is running."
-msgstr ""
+msgstr "호환성 없는 버전의 하이퍼바이저가 동작 중입니다."
#: src/vminstall/msg.py:56
msgid "Unable to connect to the Xen daemon."
-msgstr ""
+msgstr "Xen 데몬 연결을 사용 할 수 없습니다."
#: src/vminstall/msg.py:57
msgid "Must be the 'root' user to manage Xen."
-msgstr ""
+msgstr "Xen 관리에는 'root' 사용자를 사용해야 합니다."
#: src/vminstall/msg.py:60
-#, fuzzy
msgid "Failed to start the VM."
-msgstr "Failed to parse: %s."
+msgstr "가상머신의 시작에 실패했습니다."
#: src/vminstall/msg.py:61
msgid "The VM has crashed."
-msgstr ""
+msgstr "가상머신이 깨졌습니다."
#: src/vminstall/msg.py:62
msgid "A VM by that name is already running."
-msgstr ""
+msgstr "그 이름의 가상머신은 이미 실행 중입니다."
#: src/vminstall/msg.py:63
msgid "A VM configuration already exists with that name."
-msgstr ""
+msgstr "그 이름의 가상머신 설정은 이미 있습니다."
#: src/vminstall/msg.py:64
msgid "A valid boot sector was not found. The installation may have failed."
-msgstr ""
+msgstr "유효한 부트 섹터를 찾을 수 없습니다. 설치에 실패 할 수 있습니다."
#: src/vminstall/msg.py:65
msgid "No kernel was found. The installation may have failed."
-msgstr ""
+msgstr "커널이 발견되지 않았습니다. 설치에 실패 할 수 있습니다."
#: src/vminstall/msg.py:68
msgid "The installation source is using an unsupported protocol."
-msgstr ""
+msgstr "설치 소스는 지원하지 않는 프로토콜을 사용 합니다."
#: src/vminstall/msg.py:69
-#, fuzzy
msgid "An error occurred while reading from the installation source."
-msgstr "소켓에서 데이터를 기다리는 동안 오류가 발생했습니다"
+msgstr "설치 소스로부터 읽는 도중 오류가 발생했습니다."
#: src/vminstall/msg.py:70
msgid "The installation source was not found."
-msgstr ""
+msgstr "설치 소스를 찾을 수 없습니다."
#: src/vminstall/msg.py:71
msgid "The installation source is unusable."
-msgstr ""
+msgstr "설치소스를 사용 할 수 없습니다."
#: src/vminstall/msg.py:72
msgid "No installation source was defined."
-msgstr ""
+msgstr "정의된 설치 소스가 없습니다."
#: src/vminstall/msg.py:73
msgid "A CD-ROM or DVD must be specified from which to boot."
-msgstr ""
+msgstr "부팅하는 CD-ROM 혹은 DVD 를 지정 해야합니다."
#: src/vminstall/msg.py:76
msgid "The operating system is incompatible with the processor architecture of this machine."
-msgstr ""
+msgstr "이 머신의 아키텍처와 운영체제에는 호환성이 없습니다."
#: src/vminstall/msg.py:77
msgid "The processor(s) in this machine do not support full virtualization."
-msgstr ""
+msgstr "이 머신의 프로세서는 완전 가상화를 지원하지 않습니다."
#: src/vminstall/msg.py:78
msgid "The processor(s) in this machine support full virtualization, but it is disabled in the BIOS."
-msgstr ""
+msgstr "이 머신의 프로세서는 완전 가상화를 지원하지만, BIOS에서 비활성화 됩니다."
#: src/vminstall/msg.py:81
msgid "Not enough memory."
-msgstr ""
+msgstr "메모리가 충분하지 않습니다."
#: src/vminstall/msg.py:84
msgid "The disk does not exist."
-msgstr ""
+msgstr "디스크가 없습니다."
#: src/vminstall/msg.py:85
msgid "The disk is read-only."
-msgstr ""
+msgstr "디스크가 읽기 전용입니다."
#: src/vminstall/msg.py:86
msgid "Permission was denied while attempting to access the disk."
-msgstr ""
+msgstr "디스크 접근에 접근 권한이 없습니다."
#: src/vminstall/msg.py:87
msgid "Two of the virtual disks have conflicting virtual names or physical devices."
-msgstr ""
+msgstr "두개의 가상 디스크의 이름 또는 물리 장치가 충돌하고 있습니다."
#: src/vminstall/msg.py:91
msgid "The job was canceled."
-msgstr ""
+msgstr "작업이 취소되었습니다."
#: src/vminstall/msg.py:92
msgid "The job was not found."
-msgstr ""
+msgstr "작업이 발견되지 않았습니다."
#: src/vminstall/msg.py:93
msgid "The job is in the wrong state to perform that action."
-msgstr ""
+msgstr "잘못된 작업 상태의 작업입니다."
#: src/vminstall/msg.py:96
msgid "A parameter is invalid or missing."
-msgstr ""
+msgstr "매개변수가 잘못되었거나 누락되었습니다."
# error report
#: src/vminstall/msg.py:97
-#, fuzzy
msgid "The operating system does not support paravirtualization."
-msgstr "이 시스템에서는 ACPI 또는 APM이 지원되지 않습니다."
+msgstr "운영체제는 유사가상화를 지원하지 않습니다."
# error report
#: src/vminstall/msg.py:98
-#, fuzzy
msgid "The operating system does not support automated installations."
-msgstr "이 시스템에서는 ACPI 또는 APM이 지원되지 않습니다."
+msgstr "운영체제는 자동 설치를 지원하지 않습니다."
# error report
#: src/vminstall/msg.py:99
-#, fuzzy
msgid "The operating system does not support full virtualization."
-msgstr "이 시스템에서는 ACPI 또는 APM이 지원되지 않습니다."
+msgstr "운영체제는 완전 가상화를 지원하지 않습니다."
#: src/vminstall/msg.py:102
msgid "NetWare"
-msgstr ""
+msgstr "넷웨어"
#: src/vminstall/msg.py:103
msgid "RedHat"
-msgstr ""
+msgstr "레드햇"
#: src/vminstall/msg.py:104
msgid "SUSE"
-msgstr ""
+msgstr "수세"
#: src/vminstall/msg.py:105
msgid "Windows"
-msgstr ""
+msgstr "윈도우"
#: src/vminstall/msg.py:106
msgid "Solaris"
-msgstr ""
+msgstr "솔라리스"
#: src/vminstall/msg.py:107
msgid "Other"
@@ -256,162 +252,158 @@
#: src/vminstall/msg.py:110
msgid "Novell NetWare 6.5 SP6 and older"
-msgstr ""
+msgstr "노벨 넷웨어 6.5 SP6 및 구버전"
#: src/vminstall/msg.py:111
msgid "Novell Open Enterprise Server 2 (Linux)"
-msgstr ""
+msgstr "노벨 오픈 엔터프라이즈 서버 2 (리눅스)"
#: src/vminstall/msg.py:112
msgid "Novell Open Enterprise Server 2 (NetWare)"
-msgstr ""
+msgstr "노벨 오픈 엔터프라이즈 서버 2 (넷웨어)"
#: src/vminstall/msg.py:113
msgid "openSUSE"
-msgstr ""
+msgstr "오픈수세"
#: src/vminstall/msg.py:114
msgid "Other operating system"
-msgstr ""
+msgstr "기타 운영체제"
#: src/vminstall/msg.py:115
msgid "RedHat (other)"
-msgstr ""
+msgstr "레드헷 (기타)"
#: src/vminstall/msg.py:116
msgid "RedHat Enterprise Linux 3"
-msgstr ""
+msgstr "레드햇 엔터프라이즈 리눅스 3"
#: src/vminstall/msg.py:117
msgid "RedHat Enterprise Linux 4"
-msgstr ""
+msgstr "레드햇 엔터프라이즈 리눅스 4"
#: src/vminstall/msg.py:118
msgid "RedHat Enterprise Linux 5"
-msgstr ""
+msgstr "레드햇 엔터프라이즈 리눅스 5"
#: src/vminstall/msg.py:119
msgid "SUSE Linux Enterprise Desktop 10"
-msgstr ""
+msgstr "수세 리눅스 엔터프라이즈 데스크탑 10"
#: src/vminstall/msg.py:120
msgid "SUSE Linux Enterprise Server 10"
-msgstr ""
+msgstr "수세 리눅스 엔터프라이즈 서버 10"
#: src/vminstall/msg.py:121
msgid "SUSE Linux Enterprise Server 8"
-msgstr ""
+msgstr "수세 리눅스 엔터프라이즈 서버 8"
#: src/vminstall/msg.py:122
msgid "SUSE Linux Enterprise Server 9"
-msgstr ""
+msgstr "수세 리눅스 엔터프라이즈 서버 9"
#: src/vminstall/msg.py:123
msgid "Solaris 10"
-msgstr ""
+msgstr "솔라리스 10"
#: src/vminstall/msg.py:124
msgid "Solaris 9 and older"
-msgstr ""
+msgstr "솔라리스 9 및 구버전"
#: src/vminstall/msg.py:125
msgid "SUSE (other)"
-msgstr ""
+msgstr "수세 (기타)"
#: src/vminstall/msg.py:126
msgid "Windows (other)"
-msgstr ""
+msgstr "윈도우 (기타)"
#: src/vminstall/msg.py:127
msgid "Windows (other, x64)"
-msgstr ""
+msgstr "윈도우 (기타, 64비트)"
#: src/vminstall/msg.py:128
msgid "Windows NT"
-msgstr ""
+msgstr "윈도우 NT"
#: src/vminstall/msg.py:129
msgid "Windows Vista"
-msgstr ""
+msgstr "윈도우 비스타"
#: src/vminstall/msg.py:130
msgid "Windows Vista (x64)"
-msgstr ""
+msgstr "윈도우 비스타 (64비트)"
#: src/vminstall/msg.py:131
msgid "Windows Server 2008"
-msgstr ""
+msgstr "윈도우 서버 2008"
#: src/vminstall/msg.py:132
msgid "Windows Server 2008 (x64)"
-msgstr ""
+msgstr "윈도우 서버 2008 (64비트)"
#: src/vminstall/msg.py:133
msgid "Windows XP, 2000, 2003"
-msgstr ""
+msgstr "윈도우 XP, 2000, 2003"
#: src/vminstall/msg.py:134
msgid "Windows XP, 2003 (x64)"
-msgstr ""
+msgstr "윈도우 XP, 2003 (64비트)"
# Progress step 2/3
#: src/vminstall/msg.py:137
-#, fuzzy
msgid "Gathering settings..."
-msgstr "일반 설정을 읽는 중..."
+msgstr "설정 정보를 수집 중..."
#: src/vminstall/msg.py:138
-#, fuzzy
msgid "Preparing to start the installation..."
-msgstr "유선 네트워크의 장치 %s 준비중..."
+msgstr "설치 시작을 준비 중..."
# Initialization dialog contents
#: src/vminstall/msg.py:139
-#, fuzzy
msgid "Installing..."
-msgstr "초기화하고 있습니다..."
+msgstr "설치 중..."
#: src/vminstall/msg.py:140
msgid "Please wait..."
-msgstr ""
+msgstr "잠시 기다려주세요..."
#: src/vminstall/msg.py:141
msgid "Waiting for the VM to stop before continuing..."
-msgstr ""
+msgstr "계속하기 전에 가상머신 정지를 기다리는 중..."
#: src/vminstall/msg.py:142
msgid "Performing post-installation checks..."
-msgstr ""
+msgstr "설치 후 확인을 실행 중..."
#: src/vminstall/msg.py:143
msgid "Creating the run-time configuration..."
-msgstr ""
+msgstr "실행시 구성을 작성 중..."
#: src/vminstall/msg.py:144
msgid "Finishing the installation..."
-msgstr ""
+msgstr "설치를 완료하는 중..."
# Progress finished
#: src/vminstall/msg.py:145
-#, fuzzy
msgid "Finished."
-msgstr "완료됨"
+msgstr "완료되었습니다."
#: src/vminstall/msg.py:148
msgid "Paravirtualized"
-msgstr ""
+msgstr "유사가상화"
#: src/vminstall/msg.py:149
msgid "Fully virtualized"
-msgstr ""
+msgstr "완전 가상화"
#: src/vminstall/msg.py:150
msgid "Paravirtualization"
-msgstr ""
+msgstr "유사가상화"
#: src/vminstall/msg.py:151
msgid "Full virtualization"
-msgstr ""
+msgstr "완전 가상화"
# src/isdn/complex.ycp:266 src/modem/complex.ycp:207
# src/provider/complex.ycp:186
@@ -421,7 +413,7 @@
#: src/vminstall/msg.py:153
msgid "Type"
-msgstr "타입"
+msgstr "형식"
#: src/vminstall/msg.py:154
msgid "Source"
@@ -432,18 +424,16 @@
msgstr "없음"
#: src/vminstall/msg.py:158
-#, fuzzy
msgid "Create a Virtual Machine"
-msgstr "가상 머신 관리자"
+msgstr "가상머신 만들기"
#: src/vminstall/msg.py:159
msgid "Install an Operating System?"
-msgstr ""
+msgstr "운영체제를 설치 합니까?"
#: src/vminstall/msg.py:160
-#, fuzzy
msgid "Type of Operating System"
-msgstr "열린 시스템"
+msgstr "운영체제의 형식"
#: src/vminstall/msg.py:161
msgid "Summary"
@@ -451,178 +441,175 @@
#: src/vminstall/msg.py:162
msgid "Virtualization Method"
-msgstr ""
+msgstr "가상화 방법"
#: src/vminstall/msg.py:163
-#, fuzzy
msgid "Name of Virtual Machine"
-msgstr "가상 머신 관리자"
+msgstr "가상머신의 이름"
#: src/vminstall/msg.py:164
-#, fuzzy
msgid "Hardware"
-msgstr "하드 드라이브"
+msgstr "하드웨어"
#: src/vminstall/msg.py:165
msgid "Graphics"
-msgstr ""
+msgstr "그래픽"
#: src/vminstall/msg.py:166
msgid "Disks"
-msgstr ""
+msgstr "디스크"
-#: src/vminstall/msg.py:167 src/vminstall/msg.py:212
+#: src/vminstall/msg.py:167
+#: src/vminstall/msg.py:212
msgid "Virtual Disk"
-msgstr ""
+msgstr "가상 디스크"
#: src/vminstall/msg.py:168
-#, fuzzy
msgid "Network Adapters"
-msgstr "네트워크 인터페이스"
+msgstr "네트워크 어뎁터"
#: src/vminstall/msg.py:169
msgid "Virtual Network Adapter"
-msgstr ""
+msgstr "가상 네트워크 어뎁터"
#: src/vminstall/msg.py:170
msgid "Operating System Installation"
-msgstr ""
+msgstr "운영체제 설치"
# dialog caption
#: src/vminstall/msg.py:171
-#, fuzzy
msgid "Operating System Settings"
-msgstr "전원 관리 설정"
+msgstr "운영체제 설정"
#: src/vminstall/msg.py:174
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 ""
+msgstr "이 보조는 새 가상머신을 만들기에 도움을 줄것입니다. 가상머신에 관해 다음과 같은 정보가 필요합니다:"
#: src/vminstall/msg.py:175
msgid "The <b>type of operating system</b> that will run in the new VM"
-msgstr ""
+msgstr "새 가상머신에서 실행 할 <b>운영체제의 형식</b>"
#: src/vminstall/msg.py:176
msgid "Whether the VM will be <b>fully virtualized</b> or <b>paravirtualized</b>"
-msgstr ""
+msgstr "가상머신을 <b>완전 가상화</b> 혹은 <b>유사 가상화</b>로 할 것인가"
#: src/vminstall/msg.py:177
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 ""
+msgstr "가상머신에 운영체제를 설치하기 위한 파일의 <b>위치</b> 혹은 이미 운영체제가 설치되어 있는 <b>디스크</b> "
#: src/vminstall/msg.py:178
msgid "Other characteristics of the VM, such as <b>memory</b>, <b>processors</b>, and <b>network adapters</b>."
-msgstr ""
+msgstr "다른 가상머신의 정보(<b>메모리</b>, <b>프로세서</b> 그리고 <b>네트워크 어뎁터</b>)."
#. TRANSLATORS Do not translate %(url)s
#: src/vminstall/msg.py:180
#, python-format
msgid "For the most current information on Novell VM server technology, see %(url)s"
-msgstr ""
+msgstr "노벨 가상머신 기술에 관한 최신 정보는 %(url)s 를 참조"
#: src/vminstall/msg.py:181
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 ""
+msgstr "가상머신을 처음부터 만드는 경우, 운영체제를 설치 할 필요가 있습니다. 실제 머신으로부터 가상머신으로 옮기는 경우 기존의 운영체제가 설치되어 있는 디스크를 가상머신에서 다시 이용 할 수 있습니다."
#: src/vminstall/msg.py:182
msgid "I need to install an operating system."
-msgstr ""
+msgstr "운영체제를 설치할 필요가 있다."
#: src/vminstall/msg.py:183
msgid "I have a disk or disk image with an installed operating system."
-msgstr ""
+msgstr "운영체제가 설치되어 있는 디스크나 디스크 이미지가 있다."
#: src/vminstall/msg.py:184
msgid "Please choose a name for the virtual machine."
-msgstr ""
+msgstr "가상머신의 이름을 선택하세요."
#: src/vminstall/msg.py:185
msgid "Click any headline to make changes. When the settings are correct, click <b>OK</b> to create the VM."
-msgstr ""
+msgstr "변경하는 경우 헤드라인을 클릭하세요. 설정이 올바를때 <b>확인</b> 을 클릭하면 가상머신을 만듭니다."
#: src/vminstall/msg.py:186
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 ""
+msgstr "가상머신은 유사가상머신 혹은 완전 가상머신으로 사용할 수 있습니다. 유사가상머신은 속도가 빠르지만 운영체제의 지원이 필요합니다. 완전 가상머신은 다양한 운영체제로 이용 할 수 있지만 하드웨어의 지원이 필요합니다. 어느쪽을 사용합니까?"
#: src/vminstall/msg.py:187
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 ""
+msgstr "가상머신으로 실행하는 운영체제의 종류를 지정해주세요. 이 항목에는 기본값이 여러개가 있어서 유사가상화로 운영체제를 시작하는 방법에 대해 정할수 있습니다."
#: src/vminstall/msg.py:188
msgid "Some operating systems support automating the installation by specifying a URL or file(s). Select a directory to include multiple files."
-msgstr ""
+msgstr "운영체제에 따라서 URL 또는 파일을 지정해서 설치를 자동화 할 수 있습니다. 다수의 파일을 포함하기 때문에 디렉토리를 지정해주세요."
#: src/vminstall/msg.py:189
msgid "Some operating systems accept additional arguments, used to customize the installation or boot process."
-msgstr ""
+msgstr "운영체제에 따라서 추가의 인수를 지정해 설치나 부팅의 프로세스를 임의로 수정 할 수 있는것이 있습니다."
#: src/vminstall/msg.py:192
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 ""
+msgstr "부팅 가능한 가상 디스크 (대개 디스크 1 과 같은 이름의) 혹은 네트워크 설치 소스 URL 을 지정해 주세요. 가상 디스크로는 CD, DVD 또는 ISO 이미지 파일을 지정할 수 있습니다."
#: src/vminstall/msg.py:195
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 ""
+msgstr "CD-ROM 등의 장치나 ISO 같은 이미지 파일 이나 새로운 파일로 가상 디스크를 만듭니다. /dev/cdrom 와 같은 장치 노드를 지정해 주세요(마운트 포인트가 아닙니다)."
#: src/vminstall/msg.py:196
msgid "Please specify the settings for the virtual network adapter."
-msgstr ""
+msgstr "가상 네트워크 어뎁터에 대한 설정을 지정해주세요."
#: src/vminstall/msg.py:199
msgid "Specify the amount of memory and number of processors to allocate for the VM."
-msgstr ""
+msgstr "가상머신에 할당하는 메모리 용량과 프로세서 수를 지정해주세요."
#: src/vminstall/msg.py:200
msgid "For best performance, the number of virtual processors should be less than or equal to the number of physical processors."
-msgstr ""
+msgstr "최고의 성능을 얻기 위해 가상 프로세서 갯수는 실제 물리 프로세서 갯수 이하로 지정해주세요."
#: src/vminstall/msg.py:203
msgid "Paravirtualized graphics require that an appropriate driver is installed in the operating system."
-msgstr ""
+msgstr "유사가상화 환경에서 그래픽을 사용하려면 운영체제에 적절한 드라이버가 설치되어야 합니다."
#: src/vminstall/msg.py:204
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 ""
+msgstr "가상머신은 모니터가 없는 서버와 같이 동작합니다. 이 서버에는 가상 시리얼 포트로부터 접근 할 수 있는것 외에 SSH 나 VNC 와 같이 운영체제에서 제공하는 서비스를 사용해 접근 할 수 있습니다."
#: src/vminstall/msg.py:205
msgid "Please specify the type of virtualized graphics hardware."
-msgstr ""
+msgstr "가상 그래픽 하드웨어의 형식을 지정하세요."
#: src/vminstall/msg.py:206
msgid "Paravirtualized Graphics Adapter"
-msgstr ""
+msgstr "유사가상화 그래픽 어뎁터"
#: src/vminstall/msg.py:207
msgid "VESA VGA"
-msgstr ""
+msgstr "VESA VGA"
#: src/vminstall/msg.py:208
msgid "Cirrus Logic GD5446 VGA"
-msgstr ""
+msgstr "Cirrus Logic GD5446 VGA"
#: src/vminstall/msg.py:209
msgid "No Graphics Support"
-msgstr ""
+msgstr "지원 그래픽 없음"
#: src/vminstall/msg.py:213
msgid "Virtual Disks"
-msgstr ""
+msgstr "가상 디스크"
#: src/vminstall/msg.py:214
msgid "PXE Boot"
-msgstr ""
+msgstr "PXE 부팅"
#: src/vminstall/msg.py:215
msgid "Size (GB)"
-msgstr ""
+msgstr "크기 (GB)"
#: src/vminstall/msg.py:216
msgid "Create Sparse Image File"
-msgstr ""
+msgstr "Sparse 이미지 파일을 작성"
#: src/vminstall/msg.py:217
msgid "Read-Only Access"
-msgstr ""
+msgstr "읽기 전용 접근"
# frame,
#: src/vminstall/msg.py:218
@@ -631,149 +618,143 @@
#: src/vminstall/msg.py:219
msgid "CD-ROM or DVD"
-msgstr ""
+msgstr "CD-ROM 또는 DVD"
#: src/vminstall/msg.py:220
-#, fuzzy
msgid "Floppy Disk"
-msgstr "플로피 드라이브"
+msgstr "플로피 디스크"
#: src/vminstall/msg.py:221
msgid "PXE"
-msgstr ""
+msgstr "PXE"
#: src/vminstall/msg.py:224
msgid "Fully Virtualized AMD PCnet 32"
-msgstr ""
+msgstr "완전 가상화 AMD PCnet 32"
#: src/vminstall/msg.py:225
msgid "Fully Virtualized NE2000 (ISA Bus)"
-msgstr ""
+msgstr "완전 가상화 NE2000 (ISA Bus)"
#: src/vminstall/msg.py:226
msgid "Fully Virtualized NE2000 (PCI Bus)"
-msgstr ""
+msgstr "완전 가상화 NE2000 (PCI Bus)"
#: src/vminstall/msg.py:227
msgid "Fully Virtualized Realtek 8139"
-msgstr ""
+msgstr "완전 가상화 Realtek 8139"
#: src/vminstall/msg.py:228
-#, fuzzy
msgid "MAC Address"
-msgstr "IP 주소:"
+msgstr "맥 주소"
#: src/vminstall/msg.py:229
msgid "Randomly generated MAC address"
-msgstr ""
+msgstr "무작위로 생성된 맥 주소"
#: src/vminstall/msg.py:230
msgid "Specified MAC address"
-msgstr ""
+msgstr "지정한 맥 주소"
#: src/vminstall/msg.py:233
msgid "Additional Arguments"
-msgstr ""
+msgstr "추가 인수"
#: src/vminstall/msg.py:234
-#, fuzzy
msgid "Network URL"
-msgstr "네트워크 이름(_N):"
+msgstr "네트워크 URL"
#: src/vminstall/msg.py:235
msgid "Memory"
-msgstr ""
+msgstr "메모리"
#: src/vminstall/msg.py:236
msgid "Processors"
-msgstr ""
+msgstr "프로세서"
#: src/vminstall/msg.py:237
msgid "Automated install file or URL"
-msgstr ""
+msgstr "자동 설치 파일 또는 URL"
#: src/vminstall/msg.py:238
msgid "Available Memory"
-msgstr ""
+msgstr "사용 가능한 메모리"
#: src/vminstall/msg.py:239
msgid "Available Processors"
-msgstr ""
+msgstr "사용 가능한 프로세서"
#: src/vminstall/msg.py:240
msgid "Initial Memory"
-msgstr ""
+msgstr "초기 메모리"
# combo box item
#: src/vminstall/msg.py:241
-#, fuzzy
msgid "Maximum Memory"
-msgstr "최대 성능"
+msgstr "최대 메모리"
#: src/vminstall/msg.py:242
msgid "Virtual Processors"
-msgstr ""
+msgstr "가상 프로세서"
# /usr/share/applications/YaST2/sw_source.desktop
#: src/vminstall/msg.py:243
-#, fuzzy
msgid "Installation Source"
msgstr "설치 소스"
#: src/vminstall/msg.py:244
msgid "Automated Installation"
-msgstr ""
+msgstr "자동 설치"
#: src/vminstall/msg.py:245
-#, fuzzy
msgid "Operating System"
-msgstr "열린 시스템"
+msgstr "운영체제"
#: src/vminstall/msg.py:248
msgid "Kickstart file or URL"
-msgstr ""
+msgstr "Kickstart 파일 또는 URL"
#: src/vminstall/msg.py:249
msgid "AutoYaST file"
-msgstr ""
+msgstr "AutoYaST 파일"
#: src/vminstall/msg.py:250
msgid "NetWare response file"
-msgstr ""
+msgstr "넷웨어 응답 파일"
#: src/vminstall/msg.py:253
msgid "Creating the Virtual Machine"
-msgstr ""
+msgstr "가상머신 만드는 중"
#: src/vminstall/msg.py:254
msgid "Locate Operating System Settings File"
-msgstr ""
+msgstr "운영체제 설정 파일 검색"
#: src/vminstall/msg.py:255
msgid "Locate Disk or Disk Image"
-msgstr ""
+msgstr "디스크 혹은 디스크 이미지 검색"
#: src/vminstall/msg.py:258
msgid "Do you want to add another virtual disk?"
-msgstr ""
+msgstr "다른 가상 디스크를 추가하시겠습니까?"
#: src/vminstall/msg.py:259
msgid "Do you want to add another virtual network adapter?"
-msgstr ""
+msgstr "다른 가상 네트워크 어뎁터를 추가하시겠습니까?"
#: src/vminstall/msg.py:260
msgid "What type of virtual disk do you want to add?"
-msgstr ""
+msgstr "추가하려는 가상디스크 종류는 무엇입니까?"
#: src/vminstall/msg.py:261
msgid "Where will the virtual disk physically reside?"
-msgstr ""
+msgstr "가상 디스크의 물리적 위치는 어디입니까?"
#: src/vminstall/msg.py:262
msgid "What type of virtual network adapter do you want to add?"
-msgstr ""
+msgstr "추가하려는 가상 네트워크 어뎁터의 종류는 무엇입니까?"
#: src/vminstall/msg.py:264
-#, fuzzy
msgid "Default"
-msgstr "기본 Route:"
+msgstr "기본"
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.7/po/pt_BR.po new/vm-install-0.2.8/po/pt_BR.po
--- old/vm-install-0.2.7/po/pt_BR.po 2008-04-25 16:09:07.000000000 +0200
+++ new/vm-install-0.2.8/po/pt_BR.po 2008-05-08 22:19:53.000000000 +0200
@@ -10,7 +10,7 @@
"Project-Id-Version: xen-vm-install\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-04-16 15:42-0600\n"
-"PO-Revision-Date: 2008-04-23 20:01-0300\n"
+"PO-Revision-Date: 2008-04-30 01:33-0300\n"
"Last-Translator: Luiz Fernando Ranghetti \n"
"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@
#: src/vminstall/msg.py:24
msgid "Aborted"
-msgstr "Anulado"
+msgstr "Cancelado"
#: src/vminstall/msg.py:25
msgid "Invalid URL"
@@ -141,7 +141,7 @@
#: src/vminstall/msg.py:64
msgid "A valid boot sector was not found. The installation may have failed."
-msgstr "Nenhum setor de boot válido foi encontrado. A instalação pode ter falhado."
+msgstr "Nenhum setor de inicialização válido foi encontrado. A instalação pode ter falhado."
#: src/vminstall/msg.py:65
msgid "No kernel was found. The installation may have failed."
@@ -369,7 +369,7 @@
#: src/vminstall/msg.py:140
msgid "Please wait..."
-msgstr "Favor esperar..."
+msgstr "Aguarde..."
#: src/vminstall/msg.py:141
msgid "Waiting for the VM to stop before continuing..."
@@ -429,7 +429,7 @@
#: src/vminstall/msg.py:159
msgid "Install an Operating System?"
-msgstr "Deseja Instalar um Sistema Operacional?"
+msgstr "Instalar um Sistema Operacional?"
#: src/vminstall/msg.py:160
msgid "Type of Operating System"
@@ -541,7 +541,7 @@
#: src/vminstall/msg.py:189
msgid "Some operating systems accept additional arguments, used to customize the installation or boot process."
-msgstr "Alguns sistemas operacionais aceitam argumentos adicionais, usados para personalizar a instalação ou o processo de boot."
+msgstr "Alguns sistemas operacionais aceitam argumentos adicionais, usados para personalizar a instalação ou o processo de inicialização."
#: src/vminstall/msg.py:192
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."
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.7/setup.py new/vm-install-0.2.8/setup.py
--- old/vm-install-0.2.7/setup.py 2008-04-30 00:55:42.000000000 +0200
+++ new/vm-install-0.2.8/setup.py 2008-05-07 21:47:25.000000000 +0200
@@ -1,7 +1,7 @@
from distutils.core import setup
setup(name='vminstall',
- version='0.2.7',
+ version='0.2.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.2.7/src/vmdisks/disks.py new/vm-install-0.2.8/src/vmdisks/disks.py
--- old/vm-install-0.2.7/src/vmdisks/disks.py 2008-04-11 20:45:17.000000000 +0200
+++ new/vm-install-0.2.8/src/vmdisks/disks.py 2008-05-07 21:37:35.000000000 +0200
@@ -209,7 +209,7 @@
'tap:aio': TapAioDriver('tap:aio'),
'tap:vmdk': TapVmdkDriver('tap:vmdk'),
}
-default_proto = 'tap:aio'
+default_proto = 'file'
def parse_string(disk, extended=False, blocks=None):
"""Parses a text representation of a disk, and returns such a disk object.
@@ -514,7 +514,8 @@
for disk in self.disk_group:
if disk is self:
continue
- if disk._has_path() and disk.get_path() == path:
+ has_path = disk._has_path()
+ if has_path and has_path == path:
used = True
break
if not used:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.7/src/vminstall/caps.py new/vm-install-0.2.8/src/vminstall/caps.py
--- old/vm-install-0.2.7/src/vminstall/caps.py 2008-01-02 17:24:51.000000000 +0100
+++ new/vm-install-0.2.8/src/vminstall/caps.py 2008-05-08 22:00:36.000000000 +0200
@@ -56,17 +56,25 @@
_arch = a
return _arch
-def compatible_arches():
+def compatible_arches(supports_32nonpae=True):
if is_ia64_capable():
arches = [['ia64', 'xen']]
elif is_x86_64_capable():
- arches = [['i386', 'xenpae'], ['i586', 'xenpae'], ['x86_64', 'xen']]
+ if not supports_32nonpae:
+ # SLE11 and newer 32bit support is pae only but is just 'kernel-xen', not 'kernel-xenpae'.
+ arches = [['i386', 'xen'], ['i586', 'xen'], ['x86_64', 'xen']]
+ else:
+ arches = [['i386', 'xenpae'], ['i586', 'xenpae'], ['x86_64', 'xen']]
# x86-64 can do either, but prefer to match dom0.
if arch() == 'x86_64':
arches.reverse()
else:
if is_pae_capable():
- arches = [['i386', 'xenpae'], ['i586', 'xenpae']]
+ if not supports_32nonpae:
+ # SLE11 and newer 32bit support is pae only but is just 'kernel-xen', not 'kernel-xenpae'.
+ arches = [['i386', 'xen'], ['i586', 'xen']]
+ else:
+ arches = [['i386', 'xenpae'], ['i586', 'xenpae']]
else:
arches = [['i386', 'xen'], ['i586', 'xen']]
return arches
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.7/src/vminstall/gtk/interface.py new/vm-install-0.2.8/src/vminstall/gtk/interface.py
--- old/vm-install-0.2.7/src/vminstall/gtk/interface.py 2008-02-15 22:05:30.000000000 +0100
+++ new/vm-install-0.2.8/src/vminstall/gtk/interface.py 2008-05-08 18:55:56.000000000 +0200
@@ -877,7 +877,7 @@
signal = 'action-show-console'
log.debug("%s of %s via virt-manager" % (signal, uuid))
def poke_virt_man():
- self.emit(signal, 'xen', uuid)
+ self.emit(signal, 'xen:///', uuid)
gobject.idle_add(hide_window, pbar_win)
gobject.idle_add(hide_window, self.topwin)
return False # Do not call me again
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.7/src/vminstall/msg.py new/vm-install-0.2.8/src/vminstall/msg.py
--- old/vm-install-0.2.7/src/vminstall/msg.py 2008-01-18 19:56:50.000000000 +0100
+++ new/vm-install-0.2.8/src/vminstall/msg.py 2008-05-08 22:03:48.000000000 +0200
@@ -111,13 +111,16 @@
oes2l = _("Novell Open Enterprise Server 2 (Linux)")
oes2nw = _("Novell Open Enterprise Server 2 (NetWare)")
opensuse = _("openSUSE")
+opensuse11 = _("openSUSE 11")
other_os = _("Other operating system")
redhat_other = _("RedHat (other)")
rhel3 = _("RedHat Enterprise Linux 3")
rhel4 = _("RedHat Enterprise Linux 4")
rhel5 = _("RedHat Enterprise Linux 5")
sled10 = _("SUSE Linux Enterprise Desktop 10")
+sled11 = _("SUSE Linux Enterprise Desktop 11")
sles10 = _("SUSE Linux Enterprise Server 10")
+sles11 = _("SUSE Linux Enterprise Server 11")
sles8 = _("SUSE Linux Enterprise Server 8")
sles9 = _("SUSE Linux Enterprise Server 9")
solaris10 = _("Solaris 10")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.7/src/vminstall/options.py new/vm-install-0.2.8/src/vminstall/options.py
--- old/vm-install-0.2.7/src/vminstall/options.py 2008-04-30 00:50:52.000000000 +0200
+++ new/vm-install-0.2.8/src/vminstall/options.py 2008-05-08 22:03:30.000000000 +0200
@@ -62,6 +62,7 @@
'vnc_password',
'vncport',
'pxe_boot',
+ 'non_pae',
)
dict.__init__(self, dict(map(lambda k: (k, None), default_keys)))
self.__initialized = True
@@ -195,6 +196,9 @@
if item == 'pxe_boot':
check_type(value, (int, bool))
value = bool(value)
+ if item == 'non_pae':
+ check_type(value, (int, bool))
+ value = bool(value)
self.__dict__[item] = value
@@ -275,6 +279,8 @@
defaults.apic = vmdefaults.apic()
+ defaults.non_pae = vmdefaults.supports_32nonpae()
+
if options.memoryMB:
defaults.memoryMB = options.memoryMB
else:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.7/src/vminstall/ParaVirtGuest.py new/vm-install-0.2.8/src/vminstall/ParaVirtGuest.py
--- old/vm-install-0.2.7/src/vminstall/ParaVirtGuest.py 2007-10-18 23:46:38.000000000 +0200
+++ new/vm-install-0.2.8/src/vminstall/ParaVirtGuest.py 2008-05-08 22:02:14.000000000 +0200
@@ -126,6 +126,7 @@
Potentially a heavy-weight operation."""
actions = VMDefaults[self.options.os_type].actions()
source = self.options.source
+ nonpae = VMDefaults[self.options.os_type].supports_32nonpae()
if type(source) is vmdisks.Disk:
log.debug("Installation source: %s" % source)
if not source.exists():
@@ -140,7 +141,7 @@
except Exception, e:
raise InstSrcError(InstSrcError.E_BAD, details=e.args[0])
try:
- (kfn, ifn) = actions.getInstallImagesFromPath(mountpoint, progress)
+ (kfn, ifn) = actions.getInstallImagesFromPath(mountpoint, progress, nonpae)
finally:
mounted_disk.unmount()
else:
@@ -148,7 +149,7 @@
finally:
source.block_detach()
else:
- (kfn, ifn) = actions.getInstallImagesFromUrl(source, progress)
+ (kfn, ifn) = actions.getInstallImagesFromUrl(source, progress, nonpae)
if kfn is None:
raise InstSrcError(InstSrcError.E_BAD, details=str(source))
return (kfn, ifn)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.7/src/vminstall/VMDefaults.py new/vm-install-0.2.8/src/vminstall/VMDefaults.py
--- old/vm-install-0.2.7/src/vminstall/VMDefaults.py 2008-04-11 20:39:06.000000000 +0200
+++ new/vm-install-0.2.8/src/vminstall/VMDefaults.py 2008-05-08 22:03:05.000000000 +0200
@@ -70,6 +70,8 @@
return 1
def boot_pxe(self):
return False
+ def supports_32nonpae(self):
+ return True
class LinuxDefaults(GenericDefaults):
def xterm_args(self):
@@ -178,6 +180,18 @@
def disks(self):
return [ self._disk_template(0, self._disk_size()) ]
+class openSUSE11Defaults(SUSEDefaults):
+ def name(self):
+ return msg.opensuse11
+ def default_memory(self):
+ return 384
+ def _disk_size(self):
+ return 8
+ def disks(self):
+ return [ self._disk_template(0, self._disk_size()) ]
+ def supports_32nonpae(self):
+ return False
+
class SLED10Defaults(SUSEDefaults):
def name(self):
return msg.sled10
@@ -186,6 +200,16 @@
def default_memory(self):
return 512
+class SLED11Defaults(SUSEDefaults):
+ def name(self):
+ return msg.sled11
+ def min_memory(self):
+ return 256
+ def default_memory(self):
+ return 512
+ def supports_32nonpae(self):
+ return False
+
class SLES8Defaults(SUSEDefaults):
def name(self):
return msg.sles8
@@ -218,6 +242,18 @@
def apic(self):
return True
+class SLES11Defaults(SUSEDefaults):
+ def name(self):
+ return msg.sles11
+ def default_memory(self):
+ return 512
+ def num_vcpus(self):
+ return caps.vcpu_processors(4);
+ def apic(self):
+ return True
+ def supports_32nonpae(self):
+ return False
+
class NetWareDefaults(GenericDefaults):
def group(self):
return 'netware'
@@ -410,6 +446,7 @@
'netware' : NetWareDefaults(),
'oes2l' : NOES2LDefaults(),
'oes2nw' : NOES2NWDefaults(),
+ 'opensuse11' : openSUSE11Defaults(),
'opensuse' : openSUSEDefaults(),
'other' : GenericDefaults(),
'redhat' : RedHatDefaults(),
@@ -417,7 +454,9 @@
'rhel4' : RHEL4Defaults(),
'rhel5' : RHEL5Defaults(),
'sled10' : SLED10Defaults(),
+ 'sled11' : SLED11Defaults(),
'sles10' : SLES10Defaults(),
+ 'sles11' : SLES11Defaults(),
'sles8' : SLES8Defaults(),
'sles9' : SLES9Defaults(),
'suse' : SUSEDefaults(),
@@ -434,4 +473,4 @@
'windowsnt' : WindowsNTDefaults(),
}
-default_os_type = 'opensuse'
+default_os_type = 'opensuse11'
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.7/src/vminstall/VMSUSE.py new/vm-install-0.2.8/src/vminstall/VMSUSE.py
--- old/vm-install-0.2.7/src/vminstall/VMSUSE.py 2007-10-18 23:46:38.000000000 +0200
+++ new/vm-install-0.2.8/src/vminstall/VMSUSE.py 2008-05-08 22:01:29.000000000 +0200
@@ -28,6 +28,7 @@
import msg
import util
import vmdisks
+import vminstall
autoyast_vdev = vmdisks.get_possible_vdevs(False)[-1]
@@ -42,12 +43,12 @@
raise RuntimeError
class VMSUSE(VMLinux):
- def _getPackageNames(self, base, fobj):
+ def _getPackageNames(self, base, fobj, supports_32nonpae=True):
try:
gobj = gzip.GzipFile(fileobj=StringIO(fobj.read()), mode='rb')
lines = gobj.read().splitlines()
- arches = caps.compatible_arches()
+ arches = caps.compatible_arches(supports_32nonpae)
assert(len(arches) > 0)
for a in arches:
try:
@@ -149,12 +150,12 @@
log.debug("Media roots: %s" % str(roots))
return roots
- def getInstallImagesFromPath(self, root, progress=lambda f:None):
+ def getInstallImagesFromPath(self, root, progress=lambda f:None, supports_32nonpae=True):
"""Retrieves a Xen-enabled SUSE kernel and initrd from the base path, and
copies them to temporary files. Returns the (kernel, initrd) tuple of
filenames."""
searched = []
- arches = caps.compatible_arches()
+ arches = caps.compatible_arches(supports_32nonpae)
for mediaroot in self._getMediaRoots(root):
for a in arches:
k = '/boot/%s/vmlinuz-%s' % (a[0], a[1])
@@ -186,7 +187,7 @@
fobj = open(index_path)
except:
raise InstSrcError(InstSrcError.E_BAD, details='\n'.join(searched))
- (arch, ext, kernel_disc, kernel_rpm, initrd_disc, initrd_rpm) = self._getPackageNames(root, fobj)
+ (arch, ext, kernel_disc, kernel_rpm, initrd_disc, initrd_rpm) = self._getPackageNames(root, fobj, supports_32nonpae)
# FIXME: may have to prompt to swap CDs...
@@ -202,7 +203,7 @@
log.debug("Extracted installation kernel/initrd: %s %s" % (self.kfn, self.ifn))
return (self.kfn, self.ifn)
- def getInstallImagesFromUrl(self, url, progress=lambda f:None):
+ def getInstallImagesFromUrl(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."""
@@ -231,7 +232,7 @@
raise InstSrcError(err=InstSrcError.E_UNSUPPORTED, details=url)
progress(0.1)
- arches = caps.compatible_arches()
+ arches = caps.compatible_arches(supports_32nonpae)
for mediaroot in self._getMediaRoots(base, urlopen):
for a in arches:
try:
@@ -254,7 +255,7 @@
try:
url = base + '/INDEX.gz'
fobj = urlopen(url)
- (arch, ext, kernel_disc, kernel_rpm, initrd_disc, initrd_rpm) = self._getPackageNames(base, fobj)
+ (arch, ext, kernel_disc, kernel_rpm, initrd_disc, initrd_rpm) = self._getPackageNames(base, fobj, supports_32nonpae)
# This is a heuristic: If both are on DVD1 (or CD1, or foo1, ...)
# or the disc isn't listed at all, then don't rewrite. If the discs
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org