Mailinglist Archive: opensuse-commit (1187 mails)

< Previous Next >
commit yast2-vm
  • From: root@xxxxxxx (h_root)
  • Date: Sat, 15 Apr 2006 11:45:26 +0200 (CEST)
  • Message-id: <20060415094526.209E08BE8E@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-vm
checked in at Sat Apr 15 11:45:26 CEST 2006.

--------
--- yast2-vm/yast2-vm.changes 2006-04-07 08:38:59.000000000 +0200
+++ STABLE/yast2-vm/yast2-vm.changes 2006-04-14 13:12:04.000000000 +0200
@@ -1,0 +2,14 @@
+Fri Apr 14 12:21:05 CEST 2006 - lslezak@xxxxxxx
+
+- updated vm_finish client (#161720, #161721, #161756)
+- pass static network configuration to linuxrc (#162713)
+- 2.13.35
+
+-------------------------------------------------------------------
+Wed Apr 12 14:04:43 MDT 2006 - mgfritch@xxxxxxxxxx
+
+- Launch the vncviewer using 'vncviewer localhost:<vm id>',
+ instead of using 'xm console <vmname>' (#165619)
+- 2.13.34
+
+-------------------------------------------------------------------

Old:
----
yast2-vm-2.13.33.tar.bz2

New:
----
yast2-vm-2.13.35.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-vm.spec ++++++
--- /var/tmp/diff_new_pack.2lByou/_old 2006-04-15 11:45:03.000000000 +0200
+++ /var/tmp/diff_new_pack.2lByou/_new 2006-04-15 11:45:03.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-vm (Version 2.13.33)
+# spec file for package yast2-vm (Version 2.13.35)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild

Name: yast2-vm
-Version: 2.13.33
+Version: 2.13.35
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-vm-2.13.33.tar.bz2
+Source0: yast2-vm-2.13.35.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2 yast2-installation
@@ -32,7 +32,7 @@
Ladislav Slezak <lslezak@xxxxxxx>

%prep
-%setup -n yast2-vm-2.13.33
+%setup -n yast2-vm-2.13.35

%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,14 @@
%doc %{prefix}/share/doc/packages/yast2-vm

%changelog -n yast2-vm
+* Fri Apr 14 2006 - lslezak@xxxxxxx
+- updated vm_finish client (#161720, #161721, #161756)
+- pass static network configuration to linuxrc (#162713)
+- 2.13.35
+* Wed Apr 12 2006 - mgfritch@xxxxxxxxxx
+- Launch the vncviewer using 'vncviewer localhost:<vm id>',
+ instead of using 'xm console <vmname>' (#165619)
+- 2.13.34
* Fri Apr 07 2006 - lslezak@xxxxxxx
- don't modify bootloader configuration when confguring domain0,
it's modified by kernel-xen package (#163138)

++++++ yast2-vm-2.13.33.tar.bz2 -> yast2-vm-2.13.35.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.33/VERSION new/yast2-vm-2.13.35/VERSION
--- old/yast2-vm-2.13.33/VERSION 2006-04-07 08:37:14.000000000 +0200
+++ new/yast2-vm-2.13.35/VERSION 2006-04-14 12:24:36.000000000 +0200
@@ -1 +1 @@
-2.13.33
+2.13.35
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.33/src/VM.ycp new/yast2-vm-2.13.35/src/VM.ycp
--- old/yast2-vm-2.13.33/src/VM.ycp 2006-04-07 08:36:29.000000000 +0200
+++ new/yast2-vm-2.13.35/src/VM.ycp 2006-04-14 08:30:43.000000000 +0200
@@ -4,7 +4,7 @@
* Authors: Ladislav Slezak <lslezak@xxxxxxx>
* Michael G. Fritch <mgfritch@xxxxxxxxxx>
*
- * $Id: VM.ycp 29839 2006-04-07 05:12:29Z mgfritch $
+ * $Id: VM.ycp 30089 2006-04-12 21:05:17Z mgfritch $
*/
{
module "VM";
@@ -714,12 +714,12 @@
}
}

- global boolean ViewVirtualMachineConsole(string DomName, boolean startXTerm, boolean isNetWare, boolean displayError) {
+ global boolean ViewVirtualMachineConsole(string DomName, boolean isFullVirtualization, boolean isNetWare, boolean displayError) {
boolean(string, boolean, boolean, boolean) toEval = (boolean(string, boolean, boolean, boolean))functions["ViewVirtualMachineConsole"]:nil;

if (toEval != nil)
{
- return toEval(DomName, startXTerm, isNetWare, displayError);
+ return toEval(DomName, isFullVirtualization, isNetWare, displayError);
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.33/src/VM_XEN.ycp new/yast2-vm-2.13.35/src/VM_XEN.ycp
--- old/yast2-vm-2.13.33/src/VM_XEN.ycp 2006-04-07 08:36:29.000000000 +0200
+++ new/yast2-vm-2.13.35/src/VM_XEN.ycp 2006-04-14 12:25:11.000000000 +0200
@@ -3,7 +3,7 @@
* Package: XEN specific functions and values
* Authors: Ladislav Slezak <lslezak@xxxxxxx>
* Michael G. Fritch <mgfritch@xxxxxxxxxx>
- * $Id: VM_XEN.ycp 29839 2006-04-07 05:12:29Z mgfritch $
+ * $Id: VM_XEN.ycp 30132 2006-04-14 10:21:15Z lslezak $
*/
{
module "VM_XEN";
@@ -1179,6 +1179,26 @@
string extra_arg = "";
extra_arg = VM_Common::hidden_args + " " + VM_Common::extra_args;

+ boolean isNetWare = false;
+ if (VM_Common::GetCustomKernel()) {
+ isNetWare = VM_Common::IsNetWareKernel(VM_Common::GetKernelImage());
+ }
+
+ // installation of paravirtualzed Linux using static IP
+ // write extra network config for linuxrc
+ if (VM_Common::GetVirtualizationType() == "para" && VM_Common::proposal_type == "install"
+ && !VM_Common::use_dhcp && VM_Common::use_static && !isNetWare)
+ {
+ // write network options
+ if (extra_arg != "")
+ {
+ extra_arg = extra_arg + " ";
+ }
+
+ extra_arg = extra_arg + sformat("hostip=%1 netmask=%2 gateway=%3 netdevice=%4",
+ VM_Common::ip, VM_Common::netmask, VM_Common::gateway, "eth0");
+ }
+
// add installation boot options
if (extra_arg != "" && url != "")
{
@@ -1781,13 +1801,13 @@
}


- global define boolean ViewVirtualMachineConsole(string DomName, boolean startXTerm, boolean isNetWare, boolean displayError) {
- y2milestone("ViewVirtualMachineConsole(%1, %2, %3, %4)", DomName, startXTerm, isNetWare, displayError);
+ global define boolean ViewVirtualMachineConsole(string DomName, boolean isFullVirtualization, boolean isNetWare, boolean displayError) {
+ y2milestone("ViewVirtualMachineConsole(%1, %2, %3, %4)", DomName, isFullVirtualization, isNetWare, displayError);
if (DomName != nil && DomName != "") {
- string cmd = sformat("%1 console '%2'", xm, DomName);
- if (startXTerm) {
- cmd = sformat("/usr/bin/xterm -geometry 80x%3 -T \"Xen - %2\" -e %1 console %2",
+ string cmd = sformat("/usr/bin/xterm -geometry 80x%3 -T \"Xen - %2\" -e %1 console %2",
xm, DomName, isNetWare ? 25 : 24);
+ if ( isFullVirtualization ) { // start VNC viewer
+ cmd = sformat("vncviewer localhost:%1", DomName);
}
y2milestone("Executing: %1", cmd);
/* map ret = (map)SCR::Execute(.target.bash_output, cmd);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.33/src/inst_vm_manage.ycp new/yast2-vm-2.13.35/src/inst_vm_manage.ycp
--- old/yast2-vm-2.13.33/src/inst_vm_manage.ycp 2006-04-07 08:36:29.000000000 +0200
+++ new/yast2-vm-2.13.35/src/inst_vm_manage.ycp 2006-04-14 08:30:43.000000000 +0200
@@ -431,12 +431,14 @@
if (item["name"]:nil != nil && item["name"]:"" != "") {
if (isFullVirtualization(selected_table_item) && isSDL(selected_table_item)) continue; // nothing to display when using SDL
Popup::ShowFeedback(_("Opening Virtual Machine Console"), _("Please Wait..."));
+
boolean success = VM::ViewVirtualMachineConsole(
- item["name"]:"",
- (!isFullVirtualization(selected_table_item)), // show XTerm in para virt.
+ (isFullVirtualization(selected_table_item)) ? item["id"]:"" : item["name"]:"", // use VM id # to display VNC in full virtualizaion
+ isFullVirtualization(selected_table_item), // show XTerm in para virt.
VM_Common::IsNetWareKernel(item["kernel"]:""), // check for NetWare kernel
true // show any error messages
);
+
refresh_table();
Popup::ClearFeedback();
// if (!success) Report::Error(_("Cannot open the virtual machine console."));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.33/src/vm_finish.ycp new/yast2-vm-2.13.35/src/vm_finish.ycp
--- old/yast2-vm-2.13.33/src/vm_finish.ycp 2006-02-14 16:12:23.000000000 +0100
+++ new/yast2-vm-2.13.35/src/vm_finish.ycp 2006-04-13 17:09:31.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Ladislav Slezak <lslezak@xxxxxxx>
*
- * $Id: vm_finish.ycp 27936 2006-02-13 20:01:14Z olh $
+ * $Id: vm_finish.ycp 30114 2006-04-13 15:05:26Z lslezak $
*
*/

@@ -36,24 +36,48 @@

if (func == "Info")
{
- return (any)$[
- "steps" : 1,
- // progress step title
- "title" : _("Configuring the virtual machine..."),
- // TODO FIXME: use in XEN environment
- "when" : false ? [ `installation, `update, `autoinst ] : [],
- ];
+ // return nil when the system is not Xen domainU,
+ // no change is allowed
+ if (Arch::is_xenU())
+ {
+ y2milestone("Detected Xen DomainU");
+ ret = $[
+ "steps" : 1,
+ // progress step title
+ "title" : _("Configuring the virtual machine..."),
+ "when" : false ? [ `installation, `update, `autoinst ] : [],
+ ];
+ }
+ else
+ {
+ y2milestone("Xen DomainU not detected, skipping domain configuration");
+ ret = nil;
+ }
}
else if (func == "Write")
{
+ // be sure that we are in Xen domU
+ if (Arch::is_xenU())
+ {
// disable HW services - they are useless and usually failing in a virtual machine
- list<string> disable_services = ["kbd", "hotplug", "hwscan", "powersaved"];
+ list<string> disable_services = ["acpid", "kbd"];
+
+ y2milestone("disabling services: %1", disable_services);
foreach(string s, disable_services, {
integer disabled = (integer) SCR::Execute(.target.bash, sformat("/sbin/insserv -r %1", s));
- y2milestone("insserv - service %1 exit status: %2", s, disabled);
+ y2milestone("insserv: service %1 disabled: %2", s, (disabled == 0) ? true : false);
}
);

+ // these services need force option to disable them
+ list<string> disable_services_force = ["boot.clock"];
+ y2milestone("disabling services (forced): %1", disable_services_force);
+ foreach(string s, disable_services_force, {
+ integer disabled = (integer) SCR::Execute(.target.bash, sformat("/sbin/insserv -r -f %1", s));
+ y2milestone("insserv-force: service %1 disabled: %2", s, (disabled == 0) ? true : false);
+ }
+ );
+ }
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.33/yast2-vm-2.13.30/vm.pot new/yast2-vm-2.13.35/yast2-vm-2.13.30/vm.pot
--- old/yast2-vm-2.13.33/yast2-vm-2.13.30/vm.pot 2006-03-09 12:38:43.000000000 +0100
+++ new/yast2-vm-2.13.35/yast2-vm-2.13.30/vm.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,267 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: yast2 9.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-06 14:41+0100\n"
-"PO-Revision-Date: 2006-03-07 16:51+0100\n"
-"Last-Translator: proofreader\n"
-"Language-Team: en_US\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: control/vm_install.glade:14
-msgid "Xen Virtual Machine Settings"
-msgstr ""
-
-#. warning text in proposal dialog
-#: src/VM_Common.ycp:177
-msgid "AutoYast profile for the VM cannot be configured here in full virtualization mode.<BR>Configure it inside the VM after boot."
-msgstr "The AutoYaST profile for VM cannot be configured here in full virtualization mode.<BR>Configure it inside the VM after boot."
-
-#. error message in proposal
-#: src/VM_Common.ycp:335
-msgid "OS installation source is not configured."
-msgstr "OS installation source is not configured"
-
-#. %1 is device name (e.g. hda, sda...)
-#: src/VM_XEN.ycp:347
-#, ycp-format
-msgid "Disk <I>%1</I> cannot be used"
-msgstr "Disk <tt>%1</tt> cannot be used"
-
-#: src/VM_XEN.ycp:360
-msgid "Disk <I>hdc</I> cannot be used with CD-ROM emulation"
-msgstr "Disk <tt>hdc</tt> cannot be used with CD-ROM emulation"
-
-#: src/VM_XEN.ycp:380
-msgid "Boot Device: "
-msgstr ""
-
-#: src/VM_XEN.ycp:384
-msgid "CD-ROM Image: "
-msgstr ""
-
-#: src/VM_XEN.ycp:418 src/inst_vm_network.ycp:136
-msgid "Use DHCP For Network Configuration"
-msgstr "Use DHCP for Network Configuration"
-
-#. xen domain0 installation help text - 1/4
-#: src/dom0_setup.ycp:38
-msgid ""
-"<P><B>Domain0 Configuration</B></P><P>Configuration\n"
-"of the management domain (domain0) has two parts.</P>\n"
-msgstr ""
-"<P><big><B>Domain0 Configuration</B></big></P><P>Configuration\n"
-"of the management domain (domain0) has two parts.</P>\n"
-
-#. xen domain0 installation help text - 2/4
-#: src/dom0_setup.ycp:43
-msgid ""
-"<P>The equired packages are installed into the system at first. Then the\n"
-"boot loader is switched to GRUB if it is not already used and the Xen section is\n"
-"added to the boot loader menu if it is missing.</P>\n"
-msgstr ""
-"<P>The required packages are installed into the system first. Then the\n"
-"boot loader is switched to GRUB if it is not already used and the Xen section is\n"
-"added to the boot loader menu if it is missing.</P>\n"
-
-#. xen domain0 installation help text - 3/4
-#: src/dom0_setup.ycp:49
-msgid ""
-"<P>GRUB is needed because it supports the multiboot standard required\n"
-"to boot the Xen hypervisor and Linux kernel.</P>\n"
-msgstr ""
-
-#. popup message - ask user to reboot the machine into Xen kernel
-#: src/dom0_setup.ycp:178
-msgid ""
-"The machine is ready to start the Xen management domain.\n"
-"\n"
-"Reboot the machine and select the Xen section in the boot loader menu to start it.\n"
-msgstr ""
-
-#. help text for autoyast settings (2/3)
-#: src/inst_vm_autoyast.ycp:42
-msgid ""
-"<p>It is possible to install the virtual machine using AutoYast.\n"
-"You can set all installation options in AutoYast and store them into a profile\n"
-"file that can be used later for automatic installation.</p>\n"
-msgstr ""
-"<p>It is possible to install the virtual machine using AutoYaST.\n"
-"You can set all installation options in AutoYaST and store them into a profile\n"
-"file that can be used later for automatic installation.</p>\n"
-
-#. help text for autoyast settings (3/3)
-#: src/inst_vm_autoyast.ycp:47
-msgid ""
-"<p>If the profile contains configuration of a virtual machine\n"
-"(CPU, memory, virtual disk configuration, etc.) it can be loaded and\n"
-"used instead of the current configuration.</p>\n"
-msgstr ""
-"<p>If the profile contains configuration of a virtual machine\n"
-"(CPU, memory, virtual disk configuration, etc.), it can be loaded and\n"
-"used instead of the current configuration.</p>\n"
-
-#: src/inst_vm_disks.ycp:32
-msgid ""
-"<P><B>Create Virtual Disk Image</B></P><P>Yast will\n"
-"create a new disk image of specified size.</P>"
-msgstr ""
-"<P><B>Create Virtual Disk Image</B></P><P>YaST\n"
-"creates a new disk image of the specified size.</P>"
-
-#: src/inst_vm_disks.ycp:35 src/inst_vm_disks.ycp:128
-msgid "<P><B>Virtual Machine Device</B> is the name of the virtual disk inside the virtual machine.</P>"
-msgstr ""
-
-#: src/inst_vm_disks.ycp:41
-msgid ""
-"<P>It is possible to create <B>sparse image\n"
-"file</B> which dynamically allocates disk space when it is needed.</P>"
-msgstr ""
-"<P>It is possible to create a <B>sparse image\n"
-"file</B> that dynamically allocates disk space when it is needed.</P>"
-
-#. label - disk device widget (enter /dev/hda1, /dev/sdb3...)
-#: src/inst_vm_disks.ycp:58 src/inst_vm_disks.ycp:145
-msgid "&Virtual Machine Device"
-msgstr ""
-
-#: src/inst_vm_disks.ycp:237
-msgid "<P><B>Block Device</B>: The virtual machine can use only block devices accessible from domain 0.</P>"
-msgstr ""
-
-#: src/inst_vm_disks.ycp:239
-msgid "<P><B>Virtual Machine Device</B> is the name of the virtual device presented to the virtual machine."
-msgstr ""
-
-#: src/inst_vm_disks.ycp:241
-msgid ""
-"<P>The block device can be configured <B>read-only</B>. In this case, the virtual\n"
-"machine cannot modify the device in any way.</P>\n"
-msgstr ""
-
-#: src/inst_vm_disks.ycp:254
-msgid "Block Device (Source)"
-msgstr ""
-
-#: src/inst_vm_disks.ycp:430
-msgid "Add Block Device..."
-msgstr ""
-
-#. TODO: check VM_Common::root_device
-#. help text
-#: src/inst_vm_kickoff.ycp:129
-msgid ""
-"Root device was not detected.\n"
-"Enter the root device (e.g. /dev/hda1),\n"
-"if it is not needed leave it empty."
-msgstr ""
-"Root device was not detected.\n"
-"Enter the root device, such as /dev/hda1.\n"
-"If it is not needed, leave it empty."
-
-#: src/inst_vm_options.ycp:85
-msgid "<P>Use option 'root' (e.g. 'root=/dev/hda1') for root device configuration.</P>"
-msgstr "<P>Use the <tt>root</tt> option, as in <tt>root=/dev/hda1</tt>, for root device configuration.</P>"
-
-#: src/inst_vm_source.ycp:96
-msgid "&Extract Kernel and RAM Disk Image from an Installation Source"
-msgstr ""
-
-#: src/inst_vm_source.ycp:98
-msgid "Use &Custom Kernel and RAM Disk Image Files"
-msgstr ""
-
-#: src/inst_vm_source.ycp:182
-msgid "Select RAM Disk Image"
-msgstr ""
-
-#. format CD device name: %1 is model name (e.g. "TOSHIBA DVD-ROM SD-M1402"), %2 is device name (e.g. /dev/hdc)
-#: src/inst_vm_source.ycp:399
-#, ycp-format
-msgid "%1 (%2)"
-msgstr ""
-
-#: src/inst_vm_source.ycp:408
-msgid "Boot System From"
-msgstr ""
-
-#: src/inst_vm_source.ycp:411
-msgid "CD-ROM Device"
-msgstr ""
-
-#: src/inst_vm_source.ycp:418
-msgid "&ISO Image File"
-msgstr ""
-
-#: src/inst_vm_source.ycp:430
-msgid "Virtual Hard Disk"
-msgstr ""
-
-#. help text for OS selection in full virtualization mode (1/3)
-#: src/inst_vm_source.ycp:439
-msgid "<B><BIG>Fully Virtualized Operating System</BIG></B>"
-msgstr ""
-
-#. help text for OS selection in full virtualization mode (2/3)
-#: src/inst_vm_source.ycp:441
-msgid "<P>The new virtual machine can be booted from a CDROM or hard disk.</P>"
-msgstr "<P>The new virtual machine can be booted from a CD-ROM or hard disk.</P>"
-
-#. help text for OS selection in full virtualization mode (3/3)
-#: src/inst_vm_source.ycp:443
-msgid ""
-"<P>It is assumed a new OS installation will occur if the VM is booted\n"
-"from a CDROM. In this case, after the installation the virtual machine will be\n"
-"booted from hard disk.</P>"
-msgstr ""
-"<P>It is assumed that a new OS installation will occur if the VM is booted\n"
-"from a CD-ROM. In this case, the virtual machine is\n"
-"booted from the hard disk after installation.</P>"
-
-#. error - entered empty ISO image file name
-#: src/inst_vm_source.ycp:485
-msgid "Select an ISO image file for CD-ROM emulation."
-msgstr ""
-
-#: src/inst_vm_source.ycp:498
-msgid "Select ISO Image"
-msgstr ""
-
-#. help text for virtualization mode setting (3/3)
-#: src/inst_xen_mode.ycp:53
-msgid ""
-"<p><b>Paravirtualization</b> requires a modified guest OS that\n"
-"supports Xen virtualization.</p>\n"
-msgstr ""
-
-#. help text for virtualization mode setting (4/4)
-#: src/inst_xen_mode.ycp:58
-msgid ""
-"<p><b>Full virtualization</b> requires CPU with virtualization\n"
-"support. In this case, Xen completely emulates PC hardware in a virtual machine.\n"
-"It is possible to install an unmodified guest OS.</p>\n"
-msgstr ""
-
-#. help text for virtualization mode setting (5/5)
-#: src/inst_xen_mode.ycp:64
-msgid "<p>If the mode is changed some settings (e.g. OS kernel) will be reset to default values.</p>"
-msgstr "<p>If the mode is changed, some settings, such as the OS kernel, are reset to default values.</p>"
-
-#. error - xen kernel must be running to start a new Xen domain,
-#. ask user to configure the first (management) Xen domain
-#: src/xen.ycp:90
-msgid ""
-"A Xen virtual machine can be started only\n"
-"from the management domain (domain0),\n"
-"which is not running now.\n"
-"\n"
-"Configure the management domain now?"
-msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.33/yast2-vm-2.13.33/yast2-vm-2.13.30/vm.pot new/yast2-vm-2.13.35/yast2-vm-2.13.33/yast2-vm-2.13.30/vm.pot
--- old/yast2-vm-2.13.33/yast2-vm-2.13.33/yast2-vm-2.13.30/vm.pot 2006-03-09 12:38:43.000000000 +0100
+++ new/yast2-vm-2.13.35/yast2-vm-2.13.33/yast2-vm-2.13.30/vm.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,267 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: yast2 9.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-06 14:41+0100\n"
-"PO-Revision-Date: 2006-03-07 16:51+0100\n"
-"Last-Translator: proofreader\n"
-"Language-Team: en_US\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: control/vm_install.glade:14
-msgid "Xen Virtual Machine Settings"
-msgstr ""
-
-#. warning text in proposal dialog
-#: src/VM_Common.ycp:177
-msgid "AutoYast profile for the VM cannot be configured here in full virtualization mode.<BR>Configure it inside the VM after boot."
-msgstr "The AutoYaST profile for VM cannot be configured here in full virtualization mode.<BR>Configure it inside the VM after boot."
-
-#. error message in proposal
-#: src/VM_Common.ycp:335
-msgid "OS installation source is not configured."
-msgstr "OS installation source is not configured"
-
-#. %1 is device name (e.g. hda, sda...)
-#: src/VM_XEN.ycp:347
-#, ycp-format
-msgid "Disk <I>%1</I> cannot be used"
-msgstr "Disk <tt>%1</tt> cannot be used"
-
-#: src/VM_XEN.ycp:360
-msgid "Disk <I>hdc</I> cannot be used with CD-ROM emulation"
-msgstr "Disk <tt>hdc</tt> cannot be used with CD-ROM emulation"
-
-#: src/VM_XEN.ycp:380
-msgid "Boot Device: "
-msgstr ""
-
-#: src/VM_XEN.ycp:384
-msgid "CD-ROM Image: "
-msgstr ""
-
-#: src/VM_XEN.ycp:418 src/inst_vm_network.ycp:136
-msgid "Use DHCP For Network Configuration"
-msgstr "Use DHCP for Network Configuration"
-
-#. xen domain0 installation help text - 1/4
-#: src/dom0_setup.ycp:38
-msgid ""
-"<P><B>Domain0 Configuration</B></P><P>Configuration\n"
-"of the management domain (domain0) has two parts.</P>\n"
-msgstr ""
-"<P><big><B>Domain0 Configuration</B></big></P><P>Configuration\n"
-"of the management domain (domain0) has two parts.</P>\n"
-
-#. xen domain0 installation help text - 2/4
-#: src/dom0_setup.ycp:43
-msgid ""
-"<P>The equired packages are installed into the system at first. Then the\n"
-"boot loader is switched to GRUB if it is not already used and the Xen section is\n"
-"added to the boot loader menu if it is missing.</P>\n"
-msgstr ""
-"<P>The required packages are installed into the system first. Then the\n"
-"boot loader is switched to GRUB if it is not already used and the Xen section is\n"
-"added to the boot loader menu if it is missing.</P>\n"
-
-#. xen domain0 installation help text - 3/4
-#: src/dom0_setup.ycp:49
-msgid ""
-"<P>GRUB is needed because it supports the multiboot standard required\n"
-"to boot the Xen hypervisor and Linux kernel.</P>\n"
-msgstr ""
-
-#. popup message - ask user to reboot the machine into Xen kernel
-#: src/dom0_setup.ycp:178
-msgid ""
-"The machine is ready to start the Xen management domain.\n"
-"\n"
-"Reboot the machine and select the Xen section in the boot loader menu to start it.\n"
-msgstr ""
-
-#. help text for autoyast settings (2/3)
-#: src/inst_vm_autoyast.ycp:42
-msgid ""
-"<p>It is possible to install the virtual machine using AutoYast.\n"
-"You can set all installation options in AutoYast and store them into a profile\n"
-"file that can be used later for automatic installation.</p>\n"
-msgstr ""
-"<p>It is possible to install the virtual machine using AutoYaST.\n"
-"You can set all installation options in AutoYaST and store them into a profile\n"
-"file that can be used later for automatic installation.</p>\n"
-
-#. help text for autoyast settings (3/3)
-#: src/inst_vm_autoyast.ycp:47
-msgid ""
-"<p>If the profile contains configuration of a virtual machine\n"
-"(CPU, memory, virtual disk configuration, etc.) it can be loaded and\n"
-"used instead of the current configuration.</p>\n"
-msgstr ""
-"<p>If the profile contains configuration of a virtual machine\n"
-"(CPU, memory, virtual disk configuration, etc.), it can be loaded and\n"
-"used instead of the current configuration.</p>\n"
-
-#: src/inst_vm_disks.ycp:32
-msgid ""
-"<P><B>Create Virtual Disk Image</B></P><P>Yast will\n"
-"create a new disk image of specified size.</P>"
-msgstr ""
-"<P><B>Create Virtual Disk Image</B></P><P>YaST\n"
-"creates a new disk image of the specified size.</P>"
-
-#: src/inst_vm_disks.ycp:35 src/inst_vm_disks.ycp:128
-msgid "<P><B>Virtual Machine Device</B> is the name of the virtual disk inside the virtual machine.</P>"
-msgstr ""
-
-#: src/inst_vm_disks.ycp:41
-msgid ""
-"<P>It is possible to create <B>sparse image\n"
-"file</B> which dynamically allocates disk space when it is needed.</P>"
-msgstr ""
-"<P>It is possible to create a <B>sparse image\n"
-"file</B> that dynamically allocates disk space when it is needed.</P>"
-
-#. label - disk device widget (enter /dev/hda1, /dev/sdb3...)
-#: src/inst_vm_disks.ycp:58 src/inst_vm_disks.ycp:145
-msgid "&Virtual Machine Device"
-msgstr ""
-
-#: src/inst_vm_disks.ycp:237
-msgid "<P><B>Block Device</B>: The virtual machine can use only block devices accessible from domain 0.</P>"
-msgstr ""
-
-#: src/inst_vm_disks.ycp:239
-msgid "<P><B>Virtual Machine Device</B> is the name of the virtual device presented to the virtual machine."
-msgstr ""
-
-#: src/inst_vm_disks.ycp:241
-msgid ""
-"<P>The block device can be configured <B>read-only</B>. In this case, the virtual\n"
-"machine cannot modify the device in any way.</P>\n"
-msgstr ""
-
-#: src/inst_vm_disks.ycp:254
-msgid "Block Device (Source)"
-msgstr ""
-
-#: src/inst_vm_disks.ycp:430
-msgid "Add Block Device..."
-msgstr ""
-
-#. TODO: check VM_Common::root_device
-#. help text
-#: src/inst_vm_kickoff.ycp:129
-msgid ""
-"Root device was not detected.\n"
-"Enter the root device (e.g. /dev/hda1),\n"
-"if it is not needed leave it empty."
-msgstr ""
-"Root device was not detected.\n"
-"Enter the root device, such as /dev/hda1.\n"
-"If it is not needed, leave it empty."
-
-#: src/inst_vm_options.ycp:85
-msgid "<P>Use option 'root' (e.g. 'root=/dev/hda1') for root device configuration.</P>"
-msgstr "<P>Use the <tt>root</tt> option, as in <tt>root=/dev/hda1</tt>, for root device configuration.</P>"
-
-#: src/inst_vm_source.ycp:96
-msgid "&Extract Kernel and RAM Disk Image from an Installation Source"
-msgstr ""
-
-#: src/inst_vm_source.ycp:98
-msgid "Use &Custom Kernel and RAM Disk Image Files"
-msgstr ""
-
-#: src/inst_vm_source.ycp:182
-msgid "Select RAM Disk Image"
-msgstr ""
-
-#. format CD device name: %1 is model name (e.g. "TOSHIBA DVD-ROM SD-M1402"), %2 is device name (e.g. /dev/hdc)
-#: src/inst_vm_source.ycp:399
-#, ycp-format
-msgid "%1 (%2)"
-msgstr ""
-
-#: src/inst_vm_source.ycp:408
-msgid "Boot System From"
-msgstr ""
-
-#: src/inst_vm_source.ycp:411
-msgid "CD-ROM Device"
-msgstr ""
-
-#: src/inst_vm_source.ycp:418
-msgid "&ISO Image File"
-msgstr ""
-
-#: src/inst_vm_source.ycp:430
-msgid "Virtual Hard Disk"
-msgstr ""
-
-#. help text for OS selection in full virtualization mode (1/3)
-#: src/inst_vm_source.ycp:439
-msgid "<B><BIG>Fully Virtualized Operating System</BIG></B>"
-msgstr ""
-
-#. help text for OS selection in full virtualization mode (2/3)
-#: src/inst_vm_source.ycp:441
-msgid "<P>The new virtual machine can be booted from a CDROM or hard disk.</P>"
-msgstr "<P>The new virtual machine can be booted from a CD-ROM or hard disk.</P>"
-
-#. help text for OS selection in full virtualization mode (3/3)
-#: src/inst_vm_source.ycp:443
-msgid ""
-"<P>It is assumed a new OS installation will occur if the VM is booted\n"
-"from a CDROM. In this case, after the installation the virtual machine will be\n"
-"booted from hard disk.</P>"
-msgstr ""
-"<P>It is assumed that a new OS installation will occur if the VM is booted\n"
-"from a CD-ROM. In this case, the virtual machine is\n"
-"booted from the hard disk after installation.</P>"
-
-#. error - entered empty ISO image file name
-#: src/inst_vm_source.ycp:485
-msgid "Select an ISO image file for CD-ROM emulation."
-msgstr ""
-
-#: src/inst_vm_source.ycp:498
-msgid "Select ISO Image"
-msgstr ""
-
-#. help text for virtualization mode setting (3/3)
-#: src/inst_xen_mode.ycp:53
-msgid ""
-"<p><b>Paravirtualization</b> requires a modified guest OS that\n"
-"supports Xen virtualization.</p>\n"
-msgstr ""
-
-#. help text for virtualization mode setting (4/4)
-#: src/inst_xen_mode.ycp:58
-msgid ""
-"<p><b>Full virtualization</b> requires CPU with virtualization\n"
-"support. In this case, Xen completely emulates PC hardware in a virtual machine.\n"
-"It is possible to install an unmodified guest OS.</p>\n"
-msgstr ""
-
-#. help text for virtualization mode setting (5/5)
-#: src/inst_xen_mode.ycp:64
-msgid "<p>If the mode is changed some settings (e.g. OS kernel) will be reset to default values.</p>"
-msgstr "<p>If the mode is changed, some settings, such as the OS kernel, are reset to default values.</p>"
-
-#. error - xen kernel must be running to start a new Xen domain,
-#. ask user to configure the first (management) Xen domain
-#: src/xen.ycp:90
-msgid ""
-"A Xen virtual machine can be started only\n"
-"from the management domain (domain0),\n"
-"which is not running now.\n"
-"\n"
-"Configure the management domain now?"
-msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.33/yast2-vm-2.13.33/yast2-vm-2.13.33/yast2-vm-2.13.30/vm.pot new/yast2-vm-2.13.35/yast2-vm-2.13.33/yast2-vm-2.13.33/yast2-vm-2.13.30/vm.pot
--- old/yast2-vm-2.13.33/yast2-vm-2.13.33/yast2-vm-2.13.33/yast2-vm-2.13.30/vm.pot 2006-03-09 12:38:43.000000000 +0100
+++ new/yast2-vm-2.13.35/yast2-vm-2.13.33/yast2-vm-2.13.33/yast2-vm-2.13.30/vm.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,267 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: yast2 9.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-06 14:41+0100\n"
-"PO-Revision-Date: 2006-03-07 16:51+0100\n"
-"Last-Translator: proofreader\n"
-"Language-Team: en_US\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: control/vm_install.glade:14
-msgid "Xen Virtual Machine Settings"
-msgstr ""
-
-#. warning text in proposal dialog
-#: src/VM_Common.ycp:177
-msgid "AutoYast profile for the VM cannot be configured here in full virtualization mode.<BR>Configure it inside the VM after boot."
-msgstr "The AutoYaST profile for VM cannot be configured here in full virtualization mode.<BR>Configure it inside the VM after boot."
-
-#. error message in proposal
-#: src/VM_Common.ycp:335
-msgid "OS installation source is not configured."
-msgstr "OS installation source is not configured"
-
-#. %1 is device name (e.g. hda, sda...)
-#: src/VM_XEN.ycp:347
-#, ycp-format
-msgid "Disk <I>%1</I> cannot be used"
-msgstr "Disk <tt>%1</tt> cannot be used"
-
-#: src/VM_XEN.ycp:360
-msgid "Disk <I>hdc</I> cannot be used with CD-ROM emulation"
-msgstr "Disk <tt>hdc</tt> cannot be used with CD-ROM emulation"
-
-#: src/VM_XEN.ycp:380
-msgid "Boot Device: "
-msgstr ""
-
-#: src/VM_XEN.ycp:384
-msgid "CD-ROM Image: "
-msgstr ""
-
-#: src/VM_XEN.ycp:418 src/inst_vm_network.ycp:136
-msgid "Use DHCP For Network Configuration"
-msgstr "Use DHCP for Network Configuration"
-
-#. xen domain0 installation help text - 1/4
-#: src/dom0_setup.ycp:38
-msgid ""
-"<P><B>Domain0 Configuration</B></P><P>Configuration\n"
-"of the management domain (domain0) has two parts.</P>\n"
-msgstr ""
-"<P><big><B>Domain0 Configuration</B></big></P><P>Configuration\n"
-"of the management domain (domain0) has two parts.</P>\n"
-
-#. xen domain0 installation help text - 2/4
-#: src/dom0_setup.ycp:43
-msgid ""
-"<P>The equired packages are installed into the system at first. Then the\n"
-"boot loader is switched to GRUB if it is not already used and the Xen section is\n"
-"added to the boot loader menu if it is missing.</P>\n"
-msgstr ""
-"<P>The required packages are installed into the system first. Then the\n"
-"boot loader is switched to GRUB if it is not already used and the Xen section is\n"
-"added to the boot loader menu if it is missing.</P>\n"
-
-#. xen domain0 installation help text - 3/4
-#: src/dom0_setup.ycp:49
-msgid ""
-"<P>GRUB is needed because it supports the multiboot standard required\n"
-"to boot the Xen hypervisor and Linux kernel.</P>\n"
-msgstr ""
-
-#. popup message - ask user to reboot the machine into Xen kernel
-#: src/dom0_setup.ycp:178
-msgid ""
-"The machine is ready to start the Xen management domain.\n"
-"\n"
-"Reboot the machine and select the Xen section in the boot loader menu to start it.\n"
-msgstr ""
-
-#. help text for autoyast settings (2/3)
-#: src/inst_vm_autoyast.ycp:42
-msgid ""
-"<p>It is possible to install the virtual machine using AutoYast.\n"
-"You can set all installation options in AutoYast and store them into a profile\n"
-"file that can be used later for automatic installation.</p>\n"
-msgstr ""
-"<p>It is possible to install the virtual machine using AutoYaST.\n"
-"You can set all installation options in AutoYaST and store them into a profile\n"
-"file that can be used later for automatic installation.</p>\n"
-
-#. help text for autoyast settings (3/3)
-#: src/inst_vm_autoyast.ycp:47
-msgid ""
-"<p>If the profile contains configuration of a virtual machine\n"
-"(CPU, memory, virtual disk configuration, etc.) it can be loaded and\n"
-"used instead of the current configuration.</p>\n"
-msgstr ""
-"<p>If the profile contains configuration of a virtual machine\n"
-"(CPU, memory, virtual disk configuration, etc.), it can be loaded and\n"
-"used instead of the current configuration.</p>\n"
-
-#: src/inst_vm_disks.ycp:32
-msgid ""
-"<P><B>Create Virtual Disk Image</B></P><P>Yast will\n"
-"create a new disk image of specified size.</P>"
-msgstr ""
-"<P><B>Create Virtual Disk Image</B></P><P>YaST\n"
-"creates a new disk image of the specified size.</P>"
-
-#: src/inst_vm_disks.ycp:35 src/inst_vm_disks.ycp:128
-msgid "<P><B>Virtual Machine Device</B> is the name of the virtual disk inside the virtual machine.</P>"
-msgstr ""
-
-#: src/inst_vm_disks.ycp:41
-msgid ""
-"<P>It is possible to create <B>sparse image\n"
-"file</B> which dynamically allocates disk space when it is needed.</P>"
-msgstr ""
-"<P>It is possible to create a <B>sparse image\n"
-"file</B> that dynamically allocates disk space when it is needed.</P>"
-
-#. label - disk device widget (enter /dev/hda1, /dev/sdb3...)
-#: src/inst_vm_disks.ycp:58 src/inst_vm_disks.ycp:145
-msgid "&Virtual Machine Device"
-msgstr ""
-
-#: src/inst_vm_disks.ycp:237
-msgid "<P><B>Block Device</B>: The virtual machine can use only block devices accessible from domain 0.</P>"
-msgstr ""
-
-#: src/inst_vm_disks.ycp:239
-msgid "<P><B>Virtual Machine Device</B> is the name of the virtual device presented to the virtual machine."
-msgstr ""
-
-#: src/inst_vm_disks.ycp:241
-msgid ""
-"<P>The block device can be configured <B>read-only</B>. In this case, the virtual\n"
-"machine cannot modify the device in any way.</P>\n"
-msgstr ""
-
-#: src/inst_vm_disks.ycp:254
-msgid "Block Device (Source)"
-msgstr ""
-
-#: src/inst_vm_disks.ycp:430
-msgid "Add Block Device..."
-msgstr ""
-
-#. TODO: check VM_Common::root_device
-#. help text
-#: src/inst_vm_kickoff.ycp:129
-msgid ""
-"Root device was not detected.\n"
-"Enter the root device (e.g. /dev/hda1),\n"
-"if it is not needed leave it empty."
-msgstr ""
-"Root device was not detected.\n"
-"Enter the root device, such as /dev/hda1.\n"
-"If it is not needed, leave it empty."
-
-#: src/inst_vm_options.ycp:85
-msgid "<P>Use option 'root' (e.g. 'root=/dev/hda1') for root device configuration.</P>"
-msgstr "<P>Use the <tt>root</tt> option, as in <tt>root=/dev/hda1</tt>, for root device configuration.</P>"
-
-#: src/inst_vm_source.ycp:96
-msgid "&Extract Kernel and RAM Disk Image from an Installation Source"
-msgstr ""
-
-#: src/inst_vm_source.ycp:98
-msgid "Use &Custom Kernel and RAM Disk Image Files"
-msgstr ""
-
-#: src/inst_vm_source.ycp:182
-msgid "Select RAM Disk Image"
-msgstr ""
-
-#. format CD device name: %1 is model name (e.g. "TOSHIBA DVD-ROM SD-M1402"), %2 is device name (e.g. /dev/hdc)
-#: src/inst_vm_source.ycp:399
-#, ycp-format
-msgid "%1 (%2)"
-msgstr ""
-
-#: src/inst_vm_source.ycp:408
-msgid "Boot System From"
-msgstr ""
-
-#: src/inst_vm_source.ycp:411
-msgid "CD-ROM Device"
-msgstr ""
-
-#: src/inst_vm_source.ycp:418
-msgid "&ISO Image File"
-msgstr ""
-
-#: src/inst_vm_source.ycp:430
-msgid "Virtual Hard Disk"
-msgstr ""
-
-#. help text for OS selection in full virtualization mode (1/3)
-#: src/inst_vm_source.ycp:439
-msgid "<B><BIG>Fully Virtualized Operating System</BIG></B>"
-msgstr ""
-
-#. help text for OS selection in full virtualization mode (2/3)
-#: src/inst_vm_source.ycp:441
-msgid "<P>The new virtual machine can be booted from a CDROM or hard disk.</P>"
-msgstr "<P>The new virtual machine can be booted from a CD-ROM or hard disk.</P>"
-
-#. help text for OS selection in full virtualization mode (3/3)
-#: src/inst_vm_source.ycp:443
-msgid ""
-"<P>It is assumed a new OS installation will occur if the VM is booted\n"
-"from a CDROM. In this case, after the installation the virtual machine will be\n"
-"booted from hard disk.</P>"
-msgstr ""
-"<P>It is assumed that a new OS installation will occur if the VM is booted\n"
-"from a CD-ROM. In this case, the virtual machine is\n"
-"booted from the hard disk after installation.</P>"
-
-#. error - entered empty ISO image file name
-#: src/inst_vm_source.ycp:485
-msgid "Select an ISO image file for CD-ROM emulation."
-msgstr ""
-
-#: src/inst_vm_source.ycp:498
-msgid "Select ISO Image"
-msgstr ""
-
-#. help text for virtualization mode setting (3/3)
-#: src/inst_xen_mode.ycp:53
-msgid ""
-"<p><b>Paravirtualization</b> requires a modified guest OS that\n"
-"supports Xen virtualization.</p>\n"
-msgstr ""
-
-#. help text for virtualization mode setting (4/4)
-#: src/inst_xen_mode.ycp:58
-msgid ""
-"<p><b>Full virtualization</b> requires CPU with virtualization\n"
-"support. In this case, Xen completely emulates PC hardware in a virtual machine.\n"
-"It is possible to install an unmodified guest OS.</p>\n"
-msgstr ""
-
-#. help text for virtualization mode setting (5/5)
-#: src/inst_xen_mode.ycp:64
-msgid "<p>If the mode is changed some settings (e.g. OS kernel) will be reset to default values.</p>"
-msgstr "<p>If the mode is changed, some settings, such as the OS kernel, are reset to default values.</p>"
-
-#. error - xen kernel must be running to start a new Xen domain,
-#. ask user to configure the first (management) Xen domain
-#: src/xen.ycp:90
-msgid ""
-"A Xen virtual machine can be started only\n"
-"from the management domain (domain0),\n"
-"which is not running now.\n"
-"\n"
-"Configure the management domain now?"
-msgstr ""


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


< Previous Next >