Hello community,
here is the log from the commit of package yast2-vm
checked in at Sat Sep 2 19:05:27 CEST 2006.
--------
--- arch/i386/yast2-vm/yast2-vm.changes 2006-08-10 21:20:32.000000000 +0200
+++ yast2-vm/yast2-vm.changes 2006-09-02 00:23:23.000000000 +0200
@@ -1,0 +2,11 @@
+Fri Sep 1 12:43:23 MDT 2006 - mgfritch@novell.com
+
+- Replace the 'cdrom=' entry in fully virtualized config files with
+ a corresponding disk line entry.
+- If para virtualized, kernel is extracted from a SUSE installation
+ source, and domU kernel version >= 2.6.18, add "sdl=1" to config
+ file.
+- Remove the 'extra' option with 'vnc=0 textmode=1'.
+- 2.14.0
+
+-------------------------------------------------------------------
Old:
----
yast2-vm-2.13.62.tar.bz2
New:
----
yast2-vm-2.14.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-vm.spec ++++++
--- /var/tmp/diff_new_pack.LfMcZT/_old 2006-09-02 19:05:17.000000000 +0200
+++ /var/tmp/diff_new_pack.LfMcZT/_new 2006-09-02 19:05:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-vm (Version 2.13.62)
+# spec file for package yast2-vm (Version 2.14.0)
#
# 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.62
+Version: 2.14.0
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-vm-2.13.62.tar.bz2
+Source0: yast2-vm-2.14.0.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2 yast2-installation
@@ -34,7 +34,7 @@
Michael G. Fritch
%prep
-%setup -n yast2-vm-2.13.62
+%setup -n yast2-vm-2.14.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -75,6 +75,14 @@
%doc %{prefix}/share/doc/packages/yast2-vm
%changelog -n yast2-vm
+* Fri Sep 01 2006 - mgfritch@novell.com
+- Replace the 'cdrom=' entry in fully virtualized config files with
+ a corresponding disk line entry.
+- If para virtualized, kernel is extracted from a SUSE installation
+ source, and domU kernel version >= 2.6.18, add "sdl=1" to config
+ file.
+- Remove the 'extra' option with 'vnc=0 textmode=1'.
+- 2.14.0
* Mon Aug 07 2006 - mgfritch@novell.com
- Always write out "/usr/lib/xen/bin/qemu-dm" for the device_model
field in a fully virtualized VM configuration file. (#193854)
++++++ yast2-vm-2.13.62.tar.bz2 -> yast2-vm-2.14.0.tar.bz2 ++++++
++++ 2409 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.62/VERSION new/yast2-vm-2.14.0/VERSION
--- old/yast2-vm-2.13.62/VERSION 2006-08-08 00:36:27.000000000 +0200
+++ new/yast2-vm-2.14.0/VERSION 2006-09-01 20:55:49.000000000 +0200
@@ -1 +1 @@
-2.13.62
+2.14.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.62/configure.in new/yast2-vm-2.14.0/configure.in
--- old/yast2-vm-2.13.62/configure.in 2006-08-10 20:21:46.000000000 +0200
+++ new/yast2-vm-2.14.0/configure.in 2006-09-01 23:56:40.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.62, http://www.suse.de/feedback, yast2-vm)
+AC_INIT(yast2-vm, 2.14.0, 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.62"
+VERSION="2.14.0"
RPMNAME="yast2-vm"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.62/src/VM.ycp new/yast2-vm-2.14.0/src/VM.ycp
--- old/yast2-vm-2.13.62/src/VM.ycp 2006-08-10 19:59:39.000000000 +0200
+++ new/yast2-vm-2.14.0/src/VM.ycp 2006-08-10 20:06:41.000000000 +0200
@@ -4,7 +4,7 @@
* Authors: Ladislav Slezak
* Michael G. Fritch
*
- * $Id: VM.ycp 32314 2006-08-10 18:01:11Z mgfritch $
+ * $Id: VM.ycp 32320 2006-08-10 18:08:16Z mgfritch $
*/
{
module "VM";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.62/src/VM_Common.ycp new/yast2-vm-2.14.0/src/VM_Common.ycp
--- old/yast2-vm-2.13.62/src/VM_Common.ycp 2006-08-10 19:59:39.000000000 +0200
+++ new/yast2-vm-2.14.0/src/VM_Common.ycp 2006-08-10 20:06:41.000000000 +0200
@@ -4,7 +4,7 @@
* Authors: Ladislav Slezak
* Michael G. Fritch
*
- * $Id: VM_Common.ycp 32314 2006-08-10 18:01:11Z mgfritch $
+ * $Id: VM_Common.ycp 32320 2006-08-10 18:08:16Z mgfritch $
*/
{
module "VM_Common";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.62/src/VM_XEN.ycp new/yast2-vm-2.14.0/src/VM_XEN.ycp
--- old/yast2-vm-2.13.62/src/VM_XEN.ycp 2006-08-10 19:59:39.000000000 +0200
+++ new/yast2-vm-2.14.0/src/VM_XEN.ycp 2006-09-02 00:21:37.000000000 +0200
@@ -3,7 +3,7 @@
* Package: XEN specific functions and values
* Authors: Ladislav Slezak
* Michael G. Fritch
- * $Id: VM_XEN.ycp 32314 2006-08-10 18:01:11Z mgfritch $
+ * $Id: VM_XEN.ycp 32678 2006-09-01 22:23:11Z mgfritch $
*/
{
module "VM_XEN";
@@ -46,16 +46,20 @@
string default_cdrom_image = "";
string cdrom_image = default_cdrom_image;
+ string default_cdrom_image_type = "phy";
+ string cdrom_image_type = default_cdrom_image_type;
+
global map SubExport() {
map ret = $[
- "Common" : VM_Common::Export(),
- "disks" : disks,
- "network" : network,
- "kernel_path" : kernel_path,
- "initrd_path" : initrd_path,
- "restart" : restart,
- "boot_device" : boot_device,
- "cdrom_image" : cdrom_image
+ "Common" : VM_Common::Export(),
+ "disks" : disks,
+ "network" : network,
+ "kernel_path" : kernel_path,
+ "initrd_path" : initrd_path,
+ "restart" : restart,
+ "boot_device" : boot_device,
+ "cdrom_image" : cdrom_image,
+ "cdrom_image_type" : cdrom_image_type
];
y2milestone("SubExport() returned: %1", ret);
@@ -88,13 +92,14 @@
// import the VM_Common AutoYaST settings
VM_Common::Import(input["Common"]:$[]);
- disks = input["disks"]:disks;
- network = input["network"]:network;
- kernel_path = input["kernel_path"]:kernel_path;
- initrd_path = input["initrd_path"]:initrd_path;
- restart = input["restart"]:restart; //FIXME: config file option 'restart' is depreciated!!!
- boot_device = input["boot_device"]:boot_device;
- cdrom_image = input["cdrom_image"]:cdrom_image;
+ disks = input["disks"]:disks;
+ network = input["network"]:network;
+ kernel_path = input["kernel_path"]:kernel_path;
+ initrd_path = input["initrd_path"]:initrd_path;
+ restart = input["restart"]:restart; //FIXME: config file option 'restart' is depreciated!!!
+ boot_device = input["boot_device"]:boot_device;
+ cdrom_image = input["cdrom_image"]:cdrom_image;
+ cdrom_image_type = input["cdrom_image_type"]:cdrom_image_type;
return true;
}
@@ -858,11 +863,13 @@
//default to the first cdrom device...
list<map> cd_hwinfo = (list<map>)SCR::Read(.probe.cdrom);
if (cd_hwinfo != nil) {
- map dev = cd_hwinfo[0]:$[];
+ map dev = cd_hwinfo[0]:$[];
cdrom_image = dev["dev_name"]:"/dev/hdc";
+ cdrom_image_type = "phy";
}
else {
cdrom_image = default_cdrom_image;
+ cdrom_image_type = default_cdrom_image_type;
}
}
@@ -870,6 +877,7 @@
boot_device = "c";
if (VM_Common::proposal_type != "boot") {// allow the cdrom_image setting to persist when moving from proposal_type 'install' to proposal_type 'boot'. See bugzilla #174616.
cdrom_image = default_cdrom_image;
+ cdrom_image_type = default_cdrom_image_type;
}
}
@@ -886,7 +894,13 @@
if (cdrom_image == nil)
{
- cdrom_image = "";
+ cdrom_image = default_cdrom_image;
+ }
+
+ cdrom_image_type = opts["cdrom_image_type"]:"phy";
+ if (cdrom_image_type == nil || cdrom_image_type == "")
+ {
+ cdrom_image_type = default_cdrom_image_type;
}
string bd = opts["boot_device"]:"c";
@@ -906,7 +920,7 @@
global define map GetFullOptions()
{
- return $["cdrom_image":cdrom_image, "boot_device":boot_device];
+ return $["cdrom_image":cdrom_image, "cdrom_image_type":cdrom_image_type, "boot_device":boot_device];
}
global define boolean isPAEKernel() {
@@ -1320,6 +1334,15 @@
}
);
+ if (ioemu) { // fully virtualized guest
+ if (size(ret) > 0)
+ {
+ ret = ret + ", ";
+ }
+ // Replace the 'cdrom=' line in config files for hvm guests with a disk line entry for the cdrom
+ ret = ret + sformat("'%1:%2,hdc:cdrom,r'", cdrom_image_type, cdrom_image);
+ }
+
ret = "[ " + ret + " ]";
y2milestone("Disk configuration: %1", ret);
@@ -1812,6 +1835,16 @@
ret = ret && WriteOption(configpath, "vncviewer", tostring((VM_Common::sdl == 1) ? 0 : 1));
ret = ret && WriteOption(configpath, "ne2000", tostring(VM_Common::ne2000));
}
+ else {
+ if (VM_Common::GetCustomKernel() == false) { // kernel extracted from SUSE install source
+ string kernel_ver = regexpsub(kernel_path, ".*vmlinuz-(.*)-xen", "\\1");
+ y2milestone("Kernel version is: %1", kernel_ver);
+ list<string> kernel_ver_list = splitstring(kernel_ver, ".-");
+ if (tointeger(kernel_ver_list[0]:"0") >= 2 && tointeger(kernel_ver_list[1]:"0") >= 6 && tointeger(kernel_ver_list[2]:"0") >= 18) { // if kernel version is >= 2.6.18, add "sdl=1" to the vm config file
+ ret = ret && WriteOption(configpath, "sdl", "1");
+ }
+ }
+ }
ret = ret && WriteOption(configpath, "localtime", tostring(VM_Common::localtime));
@@ -1824,12 +1857,6 @@
{
// write boot device option
ret = ret && WriteStringOption(configpath, "boot", boot_device);
-
- // write CD-ROM configuration if booting from a CD
-// if (boot_device == "d") {
- if (VM_Common::proposal_type != "existing") {
- ret = ret && WriteStringOption(configpath, "cdrom", cdrom_image);
- }
}
if (VM_Common::GetVirtualizationType() != "full")
@@ -1964,7 +1991,8 @@
}
global define boolean resetExtraArgs() {
- string arg = (VM_Common::proposal_type == "install") ? "TERM=xterm textmode=1 vnc=0" : "TERM=xterm";
+// string arg = (VM_Common::proposal_type == "install") ? "TERM=xterm textmode=1 vnc=0" : "TERM=xterm";
+ string arg = "TERM=xterm";
VM_Common::extra_args = arg;
return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.62/src/inst_vm_disks.ycp new/yast2-vm-2.14.0/src/inst_vm_disks.ycp
--- old/yast2-vm-2.13.62/src/inst_vm_disks.ycp 2006-08-10 19:59:39.000000000 +0200
+++ new/yast2-vm-2.14.0/src/inst_vm_disks.ycp 2006-08-10 20:06:41.000000000 +0200
@@ -6,7 +6,7 @@
*
* Purpose: Ask the user for virtual disks configuration.
*
- * $Id: inst_vm_disks.ycp 32314 2006-08-10 18:01:11Z mgfritch $
+ * $Id: inst_vm_disks.ycp 32320 2006-08-10 18:08:16Z mgfritch $
*
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.62/src/inst_vm_source.ycp new/yast2-vm-2.14.0/src/inst_vm_source.ycp
--- old/yast2-vm-2.13.62/src/inst_vm_source.ycp 2006-06-27 21:39:56.000000000 +0200
+++ new/yast2-vm-2.14.0/src/inst_vm_source.ycp 2006-09-02 00:21:37.000000000 +0200
@@ -6,7 +6,7 @@
*
* Purpose: Ask the user for installation source for the virtual machine.
*
- * $Id: inst_vm_source.ycp 31682 2006-06-27 07:59:44Z lslezak $
+ * $Id: inst_vm_source.ycp 32678 2006-09-01 22:23:11Z mgfritch $
*
*/
{
@@ -806,9 +806,10 @@
map fulloption = VM_XEN::GetFullOptions();
string cd = fulloption["cdrom_image"]:"";
+ string cd_type = fulloption["cdrom_image_type"]:"phy";
string boot = fulloption["boot_device"]:"c";
- y2milestone("VTx config: cdrom_image: %1, boot_device: %2", cd, boot);
+ y2milestone("VTx config: cdrom_image: %1, cdrom_image_type: %2, boot_device: %3", cd, cd_type, boot);
list<string> cd_devs = [];
list<term> cd_items = [];
@@ -841,7 +842,7 @@
`RadioButtonGroup(`id(`rb_group),
`VBox(
// radio button label
- `Left(`RadioButton(`id(`cdrom), `opt(`notify), _("&CD / DVD Device"), boot == "d" && contains(cd_devs, cd))),
+ `Left(`RadioButton(`id(`cdrom), `opt(`notify), _("&CD / DVD Device"), boot == "d" && cd_type != "file")),
`HBox(
`HSpacing(3),
// combo box label
@@ -850,11 +851,11 @@
),
`VSpacing(1),
// radio button label
- `Left(`RadioButton(`id(`iso), `opt(`notify), _("&ISO Image File"), boot == "d" && !contains(cd_devs, cd))),
+ `Left(`RadioButton(`id(`iso), `opt(`notify), _("&ISO Image File"), boot == "d" && cd_type == "file")),
`HBox(
`HSpacing(3),
// textbox label
- `TextEntry(`id(`cdromimage), `opt(`hstretch), _("&File Name"), boot == "d" && !contains(cd_devs, cd) ? cd : ""),
+ `TextEntry(`id(`cdromimage), `opt(`hstretch), _("&File Name"), (boot == "d" && cd_type == "file" && !contains(cd_devs, cd)) ? cd : ""),
`HSpacing(1),
`VBox(
`Label(""),
@@ -877,8 +878,8 @@
Wizard::SetContents (caption, contents, help_text, true, true);
- if (contains(cd_devs, cd))
- UI::ChangeWidget(`id(`rb_group), `CurrentButton, `cdrom);
+ if (cd_type != "file")
+ UI::ChangeWidget(`id(`rb_group), `CurrentButton, `cdrom);
else
UI::ChangeWidget(`id(`rb_group), `CurrentButton, `iso);
@@ -898,7 +899,6 @@
}
else if (ret == `next) {
symbol bootdev_symbol = (symbol)(UI::QueryWidget(`id(`rb_group), `CurrentButton));
-// string bootdev = (bootdev_symbol == `disk) ? "c" : "d";
string bootdev = (VM_Common::proposal_type == "install") ? "d" : "c";
y2milestone("bootdev_symbol: %1", bootdev_symbol);
@@ -922,7 +922,7 @@
}
else
{
- map opts = $["boot_device":bootdev, "cdrom_image":cdimg];
+ map opts = $["boot_device":bootdev, "cdrom_image":cdimg, "cdrom_image_type": ((bootdev_symbol == `cdrom) ? "phy" : "file")];
y2milestone("Full virtualization options: %1", opts);
VM_XEN::SetFullOptions( opts );
break;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org