Hello community,
here is the log from the commit of package yast2-vm
checked in at Thu Apr 27 00:39:46 CEST 2006.
--------
--- yast2-vm/yast2-vm.changes 2006-04-21 23:27:16.000000000 +0200
+++ STABLE/yast2-vm/yast2-vm.changes 2006-04-26 21:04:17.000000000 +0200
@@ -1,0 +2,23 @@
+Wed Apr 26 12:02:46 MDT 2006 - mgfritch@novell.com
+
+- Specify the CD-ROM device name in the URL to be used for
+ extracting the kernel/initrd from a SUSE CD/DVD media.
+- Always display the size of each disk in the disk overview table
+ regardless of it's type (loop-create, loop-use, or phys).
+- Values on_reboot, on_crash, and on_poweroff must always be
+ rewritten to the config file when virtualization type is
+ full. (#168203)
+- Strip off any query string before writing the "install="
+ setting. (#169829)
+- 2.13.40
+
+-------------------------------------------------------------------
+Tue Apr 25 12:18:21 MDT 2006 - mgfritch@novell.com
+
+- Must always create new disk images when they are added as a new
+ disk to the table of disk images (#168206)
+- Always Unmount the YaST ini agent before writing settings to a
+ config file (#168165)
+- 2.13.39
+
+-------------------------------------------------------------------
Old:
----
yast2-vm-2.13.38.tar.bz2
New:
----
yast2-vm-2.13.40.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-vm.spec ++++++
--- /var/tmp/diff_new_pack.VsYotx/_old 2006-04-27 00:39:34.000000000 +0200
+++ /var/tmp/diff_new_pack.VsYotx/_new 2006-04-27 00:39:34.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-vm (Version 2.13.38)
+# spec file for package yast2-vm (Version 2.13.40)
#
# 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.38
+Version: 2.13.40
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-vm-2.13.38.tar.bz2
+Source0: yast2-vm-2.13.40.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
%prep
-%setup -n yast2-vm-2.13.38
+%setup -n yast2-vm-2.13.40
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,23 @@
%doc %{prefix}/share/doc/packages/yast2-vm
%changelog -n yast2-vm
+* Wed Apr 26 2006 - mgfritch@novell.com
+- Specify the CD-ROM device name in the URL to be used for
+ extracting the kernel/initrd from a SUSE CD/DVD media.
+- Always display the size of each disk in the disk overview table
+ regardless of it's type (loop-create, loop-use, or phys).
+- Values on_reboot, on_crash, and on_poweroff must always be
+ rewritten to the config file when virtualization type is
+ full. (#168203)
+- Strip off any query string before writing the "install="
+ setting. (#169829)
+- 2.13.40
+* Tue Apr 25 2006 - mgfritch@novell.com
+- Must always create new disk images when they are added as a new
+ disk to the table of disk images (#168206)
+- Always Unmount the YaST ini agent before writing settings to a
+ config file (#168165)
+- 2.13.39
* Fri Apr 21 2006 - mgfritch@novell.com
- Although console appears to be a tty, don't do character
translations (#149175)
++++++ yast2-vm-2.13.38.tar.bz2 -> yast2-vm-2.13.40.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.38/VERSION new/yast2-vm-2.13.40/VERSION
--- old/yast2-vm-2.13.38/VERSION 2006-04-21 22:25:54.000000000 +0200
+++ new/yast2-vm-2.13.40/VERSION 2006-04-26 20:02:43.000000000 +0200
@@ -1 +1 @@
-2.13.38
+2.13.40
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.38/configure new/yast2-vm-2.13.40/configure
--- old/yast2-vm-2.13.38/configure 2006-04-21 22:27:53.000000000 +0200
+++ new/yast2-vm-2.13.40/configure 2006-04-26 20:04:49.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-vm 2.13.38.
+# Generated by GNU Autoconf 2.59 for yast2-vm 2.13.40.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-vm'
PACKAGE_TARNAME='yast2-vm'
-PACKAGE_VERSION='2.13.38'
-PACKAGE_STRING='yast2-vm 2.13.38'
+PACKAGE_VERSION='2.13.40'
+PACKAGE_STRING='yast2-vm 2.13.40'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-vm 2.13.38 to adapt to many kinds of systems.
+\`configure' configures yast2-vm 2.13.40 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-vm 2.13.38:";;
+ short | recursive ) echo "Configuration of yast2-vm 2.13.40:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-vm configure 2.13.38
+yast2-vm configure 2.13.40
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-vm $as_me 2.13.38, which was
+It was created by yast2-vm $as_me 2.13.40, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-vm'
- VERSION='2.13.38'
+ VERSION='2.13.40'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.38"
+VERSION="2.13.40"
RPMNAME="yast2-vm"
MAINTAINER="Ladislav Slezak "
@@ -2654,7 +2654,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-vm $as_me 2.13.38, which was
+This file was extended by yast2-vm $as_me 2.13.40, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2709,7 +2709,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-vm config.status 2.13.38
+yast2-vm config.status 2.13.40
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.38/configure.in new/yast2-vm-2.13.40/configure.in
--- old/yast2-vm-2.13.38/configure.in 2006-04-21 22:27:41.000000000 +0200
+++ new/yast2-vm-2.13.40/configure.in 2006-04-26 20:04:33.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-vm, 2.13.38, http://www.suse.de/feedback, yast2-vm)
+AC_INIT(yast2-vm, 2.13.40, http://www.suse.de/feedback, yast2-vm)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.38"
+VERSION="2.13.40"
RPMNAME="yast2-vm"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.38/src/VM.ycp new/yast2-vm-2.13.40/src/VM.ycp
--- old/yast2-vm-2.13.38/src/VM.ycp 2006-04-19 23:52:20.000000000 +0200
+++ new/yast2-vm-2.13.40/src/VM.ycp 2006-04-25 21:21:15.000000000 +0200
@@ -4,7 +4,7 @@
* Authors: Ladislav Slezak
* Michael G. Fritch
*
- * $Id: VM.ycp 30262 2006-04-19 21:52:08Z mgfritch $
+ * $Id: VM.ycp 30476 2006-04-25 19:20:34Z mgfritch $
*/
{
module "VM";
@@ -930,7 +930,7 @@
// ResetMAC();
// ResetUserName();
ResetNetworkConfig();
-// ResetVirtualizationType(); // NOTE: reseting this value causes strange settings since most are calculated base on virtualization type.
+// ResetVirtualizationType(); // NOTE: reseting this value causes strange settings since most are calculated based on virtualization type.
ResetAutoYastProfile();
ResetMemorySize();
ResetNumberOfCpus();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.38/src/VM_XEN.ycp new/yast2-vm-2.13.40/src/VM_XEN.ycp
--- old/yast2-vm-2.13.38/src/VM_XEN.ycp 2006-04-19 23:52:20.000000000 +0200
+++ new/yast2-vm-2.13.40/src/VM_XEN.ycp 2006-04-26 20:14:41.000000000 +0200
@@ -3,7 +3,7 @@
* Package: XEN specific functions and values
* Authors: Ladislav Slezak
* Michael G. Fritch
- * $Id: VM_XEN.ycp 30262 2006-04-19 21:52:08Z mgfritch $
+ * $Id: VM_XEN.ycp 30513 2006-04-26 18:14:00Z mgfritch $
*/
{
module "VM_XEN";
@@ -864,7 +864,7 @@
else { // para
if (VM_Common::proposal_type == "install") {
// look for a valid network inst source
- VM_Common::inst_type = `network_configured; // FIXME: should the inst_type always be reset to `cdrom
+ VM_Common::inst_type = `network_configured;
VM_Common::source_id = VM_Common::ProposeSelection();
if (VM_Common::source_id == nil || VM_Common::source_id < 0) { // if no valid network inst source is found
VM_Common::inst_type = `cdrom;
@@ -1106,6 +1106,7 @@
SCR::Execute(.target.remove, configfilename);
}
+ SCR::UnmountAgent(.etc.xen);
path configpath = .etc.xen.value + topath(conf_path + VM_Common::config_name);
boolean ret = WriteOption(configpath, "disk", formatDiskConfig(disks, VM_Common::GetVirtualizationType() == "full"));
@@ -1229,6 +1230,12 @@
{
url = "slp://";
}
+ // Strip off any query string before writing the "install=" setting (#169829)
+ string old_url = url;
+ url = regexpsub(url, "^(.*)\\?.*", "\\1");
+ if (url == nil || url == "") {
+ url = old_url; // fall back to the old url incase the regexpsub fails.
+ }
VM_Common::SetHiddenArgs(kernel_path);
string extra_arg = "";
@@ -1517,84 +1524,6 @@
VM_Common::hidden_args = "";
}
- global define boolean Prepare2() {
- boolean ret = true;
-
- kernel_path = VM_Common::GetKernelImage();
- initrd_path = VM_Common::GetInitrdImage();
-
- SCR::UnmountAgent(.etc.xen);
- path configpath = .etc.xen.value + topath(conf_path + VM_Common::config_name);
-
- // remove the disk with autoyast profile
- if (VM_Common::GetVirtualizationType() != "full" && VM_Common::autoyast_profile != nil && VM_Common::autoyast_profile != "")
- {
- // remove the last disk (image with autoyast profile)
- disks = remove(disks, size(disks) - 1);
- ret = WriteOption(configpath, "disk", formatDiskConfig(disks, VM_Common::GetVirtualizationType() == "full"));
-
- string command = "/bin/rm " + img_prefix + VM_Common::config_name + "/autoyast.img";
- integer out = (integer)SCR::Execute(.target.bash, command);
- if (out != 0)
- {
- y2warning("Cannot remove autoyast image, command: %1 failed", command);
- }
- }
- else {
- ret = WriteOption(configpath, "disk", formatDiskConfig(disks, VM_Common::GetVirtualizationType() == "full"));
- }
-
- // all following action are needed only in paravirtualization mode
- if (VM_Common::GetVirtualizationType() == "full")
- {
- // update boot configuration if the VM booted from a CD
- if (boot_device == "d")
- {
- // set boot from hard disk
- ret = ret && WriteStringOption(configpath, "boot", "c");
-
- // flush the changes
- ret = ret && SCR::Write(.etc.xen, nil);
- }
-
- return ret;
- }
- else {
- ret = ret && WriteStringOption(configpath, "bootloader", "/usr/lib/xen/boot/domUloader.py");
- }
-
- ret = ret && WriteOption(configpath, "memory", tostring(VM_Common::memory_size));
- ret = ret && WriteOption(configpath, "vcpus", tostring(VM_Common::number_of_cpus));
-
-
- if (VM_Common::root_device == nil || VM_Common::root_device == "") {
- ReadDiskImages(img_prefix + VM_Common::config_name);
- }
-
- // upadate config - root device, set default runlevel, remove install= option
-// ret = ret && SCR::Write(configpath + "restart", nil);
-
- VM_Common::SetHiddenArgs(kernel_path);
- string extra = VM_Common::hidden_args + " " + VM_Common::extra_args;
- ret = ret && WriteStringOption(configpath, "extra", extra);
-
- if (VM_Common::proposal_type != "install" && VM_Common::GetVirtualizationType() == "para"/* && VM_Common::root_device != ""*/) {
- string bootentry = sformat("%1:%2", VM_Common::root_device, kernel_path);
- if (initrd_path != "") {
- bootentry = bootentry + "," + initrd_path;
- }
- ret = ret && WriteStringOption(configpath, "bootentry", bootentry);
- }
-
- ret = ret && WriteStringOption(configpath, "on_poweroff", VM_Common::on_poweroff);
- ret = ret && WriteStringOption(configpath, "on_reboot", VM_Common::on_reboot);
- ret = ret && WriteStringOption(configpath, "on_crash", VM_Common::on_crash);
-
- // flush the changes
- ret = ret && SCR::Write(.etc.xen, nil);
-
- return ret;
- }
/*global define boolean UpdateRoot(string root)
{
@@ -1663,6 +1592,88 @@
return ret;
}
+
+ global define boolean Prepare2() {
+ boolean ret = true;
+
+ kernel_path = VM_Common::GetKernelImage();
+ initrd_path = VM_Common::GetInitrdImage();
+
+ SCR::UnmountAgent(.etc.xen);
+ path configpath = .etc.xen.value + topath(conf_path + VM_Common::config_name);
+
+ // remove the disk with autoyast profile
+ if (VM_Common::GetVirtualizationType() != "full" && VM_Common::autoyast_profile != nil && VM_Common::autoyast_profile != "")
+ {
+ // remove the last disk (image with autoyast profile)
+ disks = remove(disks, size(disks) - 1);
+
+ string command = "/bin/rm " + img_prefix + VM_Common::config_name + "/autoyast.img";
+ integer out = (integer)SCR::Execute(.target.bash, command);
+ if (out != 0)
+ {
+ y2warning("Cannot remove autoyast image, command: %1 failed", command);
+ }
+ }
+
+ ret = WriteOption(configpath, "disk", formatDiskConfig(disks, VM_Common::GetVirtualizationType() == "full"));
+
+ // create disk image file(s)
+ y2milestone("Creating disk images...");
+ CreateDiskImages();
+
+
+ // all following action are needed only in paravirtualization mode
+ if (VM_Common::GetVirtualizationType() == "full")
+ {
+ // update boot configuration if the VM booted from a CD
+ if (boot_device == "d")
+ {
+ // set boot from hard disk
+ ret = ret && WriteStringOption(configpath, "boot", "c");
+
+ // flush the changes
+ ret = ret && SCR::Write(.etc.xen, nil);
+ }
+
+// return ret;
+ }
+ else { // para virtualized
+
+ ret = ret && WriteStringOption(configpath, "bootloader", "/usr/lib/xen/boot/domUloader.py");
+
+ if (VM_Common::root_device == nil || VM_Common::root_device == "") {
+ ReadDiskImages(img_prefix + VM_Common::config_name);
+ }
+
+ // upadate config - root device, set default runlevel, remove install= option
+// ret = ret && SCR::Write(configpath + "restart", nil);
+
+ VM_Common::SetHiddenArgs(kernel_path);
+ string extra = VM_Common::hidden_args + " " + VM_Common::extra_args;
+ ret = ret && WriteStringOption(configpath, "extra", extra);
+
+ string bootentry = sformat("%1:%2", VM_Common::root_device, kernel_path);
+ if (initrd_path != "") {
+ bootentry = bootentry + "," + initrd_path;
+ }
+ ret = ret && WriteStringOption(configpath, "bootentry", bootentry);
+ }
+
+ ret = ret && WriteOption(configpath, "memory", tostring(VM_Common::memory_size));
+ ret = ret && WriteOption(configpath, "vcpus", tostring(VM_Common::number_of_cpus));
+
+ ret = ret && WriteStringOption(configpath, "on_poweroff", VM_Common::on_poweroff);
+ ret = ret && WriteStringOption(configpath, "on_reboot", VM_Common::on_reboot);
+ ret = ret && WriteStringOption(configpath, "on_crash", VM_Common::on_crash);
+
+ // flush the changes
+ ret = ret && SCR::Write(.etc.xen, nil);
+
+ return ret;
+ }
+
+
global define boolean Prepare() {
// build/extract xen kernel and installation initrd, copy them to a temp directory.
integer new_src = -1;
@@ -1683,7 +1694,7 @@
string url = VM_Common::custom_source;
if (VM_Common::inst_type == `cdrom) {
//url = sformat("hd://?device=/dev/%1 & filesystem=iso9660", VM_Common::custom_source); // FIXME: this is not correct! What is the correct URL for specifiing a specific device (cdrom or dvd)
- url = "cd:///";
+ url = sformat("cd:///?devices=/dev/%1", VM_Common::custom_source);
}
else if (VM_Common::inst_type == `iso) {
url = sformat("iso:///?iso=%1", VM_Common::custom_source);
@@ -1698,7 +1709,7 @@
// FIXME: this if statement and following code must be removed when the correct URL for `cdrom inst_types is fixed.
if ((new_src == nil || new_src < 0) && VM_Common::inst_type == `cdrom) {
- url = "dvd:///";
+ url = sformat("dvd:///?devices=/dev/%1", VM_Common::custom_source);
new_src = Pkg::SourceCreate(url, "");
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.38/src/inst_vm_disks.ycp new/yast2-vm-2.13.40/src/inst_vm_disks.ycp
--- old/yast2-vm-2.13.38/src/inst_vm_disks.ycp 2006-04-07 07:12:49.000000000 +0200
+++ new/yast2-vm-2.13.40/src/inst_vm_disks.ycp 2006-04-26 20:14:41.000000000 +0200
@@ -6,7 +6,7 @@
*
* Purpose: Ask the user for virtual disks configuration.
*
- * $Id: inst_vm_disks.ycp 29839 2006-04-07 05:12:29Z mgfritch $
+ * $Id: inst_vm_disks.ycp 30513 2006-04-26 18:14:00Z mgfritch $
*
*/
{
@@ -180,13 +180,7 @@
}
if (ui == `next || ui == `accept) { // no input errors
- ret = $[ "size" : sz_int, "sparse" : sparse_file, "type" : "loop-create", "ro" : new_ro ];
-
- if (VM::GetVMMtype() == "xen") {
- ret = add(ret, "target", dev);
- ret = add(ret, "prefix", new_dir);
- ret = add(ret, "source", dev);
- }
+ ret = $[ "prefix" : new_dir, "source" : dev, "target" : dev, "sparse" : sparse_file, "ro" : new_ro, "type" : "loop-create", "size" : sz_int ];
}
}
}
@@ -315,11 +309,7 @@
}
if (ui == `next || ui == `accept) { // no input errors
- ret = $[ "source" : new_src, "type" : "loop-use", "ro" : new_ro ];
-
- if (VM::GetVMMtype() == "xen") {
- ret = add(ret, "target", dev);
- }
+ ret = $[ "source" : new_src, "target" : dev, "type" : "loop-use", "ro" : new_ro ];
}
}
else if (ui == `select_file) {
@@ -492,48 +482,46 @@
foreach (map m, disks, ``{
- string sz = "";
-
- if (haskey(m, "size"))
- {
- sz = tostring(m["size"]:0);
- }
-
y2milestone("disk: %1", m);
- if (m["type"]:"" == "phys")
- {
- // get size of the device, it's in sectors (512B) (x*0.5 = x*512/1024)
- sz = tostring((device_sizes[m["source"]:""]:0) / 1024);
- }
- y2milestone("sz: %1", sz);
-
- if (VM::GetVMMtype() == "xen") {
- string prefix = "";
+ integer sz = -1;
+ string prefix = "";
- if (m["type"]:"" == "loop-create")
- {
- prefix = m["prefix"]:VM::GetImgPrefix();
- if (findlastof(prefix, "/") < size(prefix)-1) { // no ending /
- prefix = sformat("%1/%2/", m["prefix"]:VM::GetImgPrefix(), VM::GetConfigName());
- }
- else {
- prefix = sformat("%1%2/", m["prefix"]:VM::GetImgPrefix(), VM::GetConfigName());
- }
+ if (m["type"]:"" == "loop-create") {
+ prefix = m["prefix"]:VM::GetImgPrefix();
+ if (findlastof(prefix, "/") < size(prefix)-1) { // no ending /
+ prefix = sformat("%1/%2/", m["prefix"]:VM::GetImgPrefix(), VM::GetConfigName());
}
- else if (m["type"]:"" == "phys")
- {
- prefix = "";
+ else {
+ prefix = sformat("%1%2/", m["prefix"]:VM::GetImgPrefix(), VM::GetConfigName());
+ }
+ sz = m["size"]:0; // size is already in MB
+ }
+ else if (m["type"]:"" == "loop-use") {
+ sz = (integer)SCR::Read(.target.size, m["source"]:"");
+ if (sz >= 0) {
+ // calculate size in MB
+ sz = (sz / 1024) / 1024;
}
-
- d = add(d, `item (`id(id_cnt), m["target"]:"", prefix + m["source"]:"", sz, (m["ro"]:false) ? UI::Glyph(`CheckMark) : "", (m["sparse"]:false) ? UI::Glyph(`CheckMark) : ""));
}
- else if (VM::GetVMMtype() == "uml") {
- d = add(d, `item (`id(id_cnt), m["size"]:0, (m["ro"]:false) ? UI::Glyph(`CheckMark) : "", (m["sparse"]:false) ? UI::Glyph(`CheckMark) : ""));
+ else if (m["type"]:"" == "phys") {
+ prefix = "";
+ // get size of the device, it's in sectors (512B) (x*0.5 = x*512/1024)
+ sz = (device_sizes[regexpsub(m["source"]:"", "/dev/(.*)", "\\1")]:0) / 1024; // calculate size in MB
}
+ string sz_str = "";
+ if (sz == nil || sz < 0)
+ sz_str = "";
+ else
+ sz_str = tostring(sz);
+
+ y2milestone("sz: %1", sz);
+
+ d = add(d, `item (`id(id_cnt), m["target"]:"", prefix + m["source"]:"", sz_str, (m["ro"]:false) ? UI::Glyph(`CheckMark) : "", (m["sparse"]:false) ? UI::Glyph(`CheckMark) : ""));
id_cnt = id_cnt + 1;
});
+
UI::ChangeWidget (`id(`disks), `Items, d);
}
@@ -569,7 +557,9 @@
help_text = help_text + _("<p>A virtual machine can have one or more virtual disks. Each virtual disk points to a file or block device on the VM Server.</p>");
Wizard::SetContents (caption, contents, help_text, true, true);
- Wizard::SetNextButton(`next, Label::OKButton());
+ Wizard::SetNextButton(`next, Label::AcceptButton());
+ Wizard::SetAbortButton(`abort, Label::CancelButton());
+ Wizard::HideBackButton();
refresh_table(disks);
@@ -628,7 +618,9 @@
}
}
- Wizard::RestoreNextButton();
+ Wizard::SetNextButton(`next, Label::NextButton());
+ Wizard::SetAbortButton(`abort, Label::AbortButton());
+ Wizard::RestoreBackButton();
return ret;
}
@@ -726,12 +718,12 @@
Wizard::OpenNextBackDialog();
map aliases = $[
- "DiskOverview" : ``(DiskOverview()),
- "AddNewLoopBack" : ``(AddNewLoopBack()),
+ "DiskOverview" : ``(DiskOverview()),
+ "AddNewLoopBack" : ``(AddNewLoopBack()),
"AddExistingLoopBack" : ``(AddExistingLoopBack()),
- "DiskType" : ``(DiskTypeDialog()),
- "AddBlockDevice" : ``(AddBlockDevice()),
- "EditDisk" : ``(EditDisk()),
+ "DiskType" : ``(DiskTypeDialog()),
+ "AddBlockDevice" : ``(AddBlockDevice()),
+ "EditDisk" : ``(EditDisk()),
];
map sequence = $[
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.38/src/inst_vm_network.ycp new/yast2-vm-2.13.40/src/inst_vm_network.ycp
--- old/yast2-vm-2.13.38/src/inst_vm_network.ycp 2006-04-07 07:12:49.000000000 +0200
+++ new/yast2-vm-2.13.40/src/inst_vm_network.ycp 2006-04-26 20:14:41.000000000 +0200
@@ -6,7 +6,7 @@
*
* Purpose: Ask user for network settings.
*
- * $Id: inst_vm_network.ycp 29839 2006-04-07 05:12:29Z mgfritch $
+ * $Id: inst_vm_network.ycp 30513 2006-04-26 18:14:00Z mgfritch $
*
*/
@@ -278,6 +278,9 @@
Wizard::SetContents (caption, contents, help_text, true, true);
+ Wizard::SetNextButton(`next, Label::AcceptButton());
+ Wizard::SetAbortButton(`abort, Label::CancelButton());
+ Wizard::HideBackButton();
refresh_table(network_conf);
@@ -417,6 +420,10 @@
}
}
+ Wizard::SetNextButton(`next, Label::NextButton());
+ Wizard::SetAbortButton(`abort, Label::AbortButton());
+ Wizard::RestoreBackButton();
+
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.38/src/inst_vm_source.ycp new/yast2-vm-2.13.40/src/inst_vm_source.ycp
--- old/yast2-vm-2.13.38/src/inst_vm_source.ycp 2006-04-19 23:52:20.000000000 +0200
+++ new/yast2-vm-2.13.40/src/inst_vm_source.ycp 2006-04-25 21:21:15.000000000 +0200
@@ -6,7 +6,7 @@
*
* Purpose: Ask the user for installation source for the virtual machine.
*
- * $Id: inst_vm_source.ycp 30262 2006-04-19 21:52:08Z mgfritch $
+ * $Id: inst_vm_source.ycp 30476 2006-04-25 19:20:34Z mgfritch $
*
*/
{
@@ -98,7 +98,7 @@
// heading in a popup dialog
`Frame(_("Install Using"),
`MarginBox(1.5, 0.2, `VBox(
- `Left(`RadioButton(`id(`network), `opt(`notify), _("Network Installation &Source"))),
+ `Left(`RadioButton(`id(`network_configured), `opt(`notify), _("Network Installation &Source"))),
`VSpacing(0.5),
`Left(`RadioButton(`id(`cdrom), `opt(`notify), _("&CD / DVD Device"))),
`VSpacing(0.5),
@@ -123,10 +123,8 @@
symbol s = `dummy;
// set the default state for the radio buttons
- if (sconfig["inst_type"]:`cdrom == `network_configured
- || sconfig["inst_type"]:`cdrom == `network_custom
- || sconfig["inst_type"]:`cdrom == `network)
- UI::ChangeWidget(`id(`rbg), `CurrentButton, `network);
+ if (sconfig["inst_type"]:`cdrom == `network_configured || sconfig["inst_type"]:`cdrom == `network_custom)
+ UI::ChangeWidget(`id(`rbg), `CurrentButton, `network_configured);
else if (sconfig["inst_type"]:`cdrom == `iso)
UI::ChangeWidget(`id(`rbg), `CurrentButton, `iso);
else
@@ -142,14 +140,17 @@
if (s == `next) {
symbol type = (symbol) UI::QueryWidget (`id(`rbg), `CurrentButton);
+ if (type == `network_configured) {
+ if (sconfig["inst_type"]:`cdrom == `network_custom)
+ type = `network_custom;
+ VM::SetCustomKernel(false);
+ }
+
y2milestone("old sconfig: %1", sconfig);
sconfig["inst_type"] = type;
updateConfig(sconfig);
y2milestone("new sconfig: %1", sconfig);
- if (type == `network)
- VM::SetCustomKernel(false);
-
string boot = (string) UI::QueryWidget (`id(`bootopts), `Value);
VM::SetExtraArgs(boot);
@@ -922,7 +923,8 @@
"ws_start" : (VM::GetVirtualizationType() == "full") ? "FullOptionsDialog" : ((VM_Common::proposal_type == "install") ? "SourceTypeDialog" : "BootOptionsDialog"),
"SourceTypeDialog" :
$[
- `network : "Network_SourceDialog",
+ `network_configured : "Network_SourceDialog",
+ `network_custom : "Network_SourceDialog",
`cdrom : "CD_SourceDialog",
`iso : "ISO_SourceDialog",
`abort : `abort,
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...