Hello community,
here is the log from the commit of package yast2-vm
checked in at Tue May 16 02:22:21 CEST 2006.
--------
--- yast2-vm/yast2-vm.changes 2006-05-10 04:01:27.000000000 +0200
+++ yast2-vm/yast2-vm.changes 2006-05-16 00:53:32.000000000 +0200
@@ -1,0 +2,14 @@
+Thu May 11 16:18:15 MDT 2006 - mgfritch@novell.com
+
+- Always write out the 'cdrom=' entry to the vm config file if
+ full virtualization and proposal_mode != 'existing'.
+ (#174616)
+- Ask for the initrd package first and the kernel package last
+ when extracting a kernel/initrd from a SUSE installation source.
+ This should ensure CD1 is in the CD-ROM drive when the VM
+ installation starts. (#175111)
+- Install kernel-xenpae by default for dom0 when running on
+ kernel-bigsmp. (#175117)
+- 2.13.47
+
+-------------------------------------------------------------------
Old:
----
yast2-vm-2.13.46.tar.bz2
New:
----
yast2-vm-2.13.47.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-vm.spec ++++++
--- /var/tmp/diff_new_pack.191s8E/_old 2006-05-16 02:21:49.000000000 +0200
+++ /var/tmp/diff_new_pack.191s8E/_new 2006-05-16 02:21:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-vm (Version 2.13.46)
+# spec file for package yast2-vm (Version 2.13.47)
#
# 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.46
-Release: 2
+Version: 2.13.47
+Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-vm-2.13.46.tar.bz2
+Source0: yast2-vm-2.13.47.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.46
+%setup -n yast2-vm-2.13.47
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,17 @@
%doc %{prefix}/share/doc/packages/yast2-vm
%changelog -n yast2-vm
+* Thu May 11 2006 - mgfritch@novell.com
+- Always write out the 'cdrom=' entry to the vm config file if
+ full virtualization and proposal_mode != 'existing'.
+ (#174616)
+- Ask for the initrd package first and the kernel package last
+ when extracting a kernel/initrd from a SUSE installation source.
+ This should ensure CD1 is in the CD-ROM drive when the VM
+ installation starts. (#175111)
+- Install kernel-xenpae by default for dom0 when running on
+ kernel-bigsmp. (#175117)
+- 2.13.47
* Tue May 09 2006 - mgfritch@novell.com
- Default the root device if a disk partition contains the
Xen Linux kernel and ramdisk. (#162593)
++++++ yast2-vm-2.13.46.tar.bz2 -> yast2-vm-2.13.47.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.46/VERSION new/yast2-vm-2.13.47/VERSION
--- old/yast2-vm-2.13.46/VERSION 2006-05-10 00:14:26.000000000 +0200
+++ new/yast2-vm-2.13.47/VERSION 2006-05-12 00:19:41.000000000 +0200
@@ -1 +1 @@
-2.13.46
+2.13.47
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.46/configure new/yast2-vm-2.13.47/configure
--- old/yast2-vm-2.13.46/configure 2006-05-10 02:15:45.000000000 +0200
+++ new/yast2-vm-2.13.47/configure 2006-05-16 00:39:24.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.46.
+# Generated by GNU Autoconf 2.59 for yast2-vm 2.13.47.
#
# 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.46'
-PACKAGE_STRING='yast2-vm 2.13.46'
+PACKAGE_VERSION='2.13.47'
+PACKAGE_STRING='yast2-vm 2.13.47'
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.46 to adapt to many kinds of systems.
+\`configure' configures yast2-vm 2.13.47 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.46:";;
+ short | recursive ) echo "Configuration of yast2-vm 2.13.47:";;
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.46
+yast2-vm configure 2.13.47
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.46, which was
+It was created by yast2-vm $as_me 2.13.47, 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.46'
+ VERSION='2.13.47'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.46"
+VERSION="2.13.47"
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.46, which was
+This file was extended by yast2-vm $as_me 2.13.47, 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.46
+yast2-vm config.status 2.13.47
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.46/configure.in new/yast2-vm-2.13.47/configure.in
--- old/yast2-vm-2.13.46/configure.in 2006-05-10 02:15:37.000000000 +0200
+++ new/yast2-vm-2.13.47/configure.in 2006-05-16 00:39:14.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.46, http://www.suse.de/feedback, yast2-vm)
+AC_INIT(yast2-vm, 2.13.47, 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.46"
+VERSION="2.13.47"
RPMNAME="yast2-vm"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.46/src/VM_XEN.ycp new/yast2-vm-2.13.47/src/VM_XEN.ycp
--- old/yast2-vm-2.13.46/src/VM_XEN.ycp 2006-05-10 04:00:22.000000000 +0200
+++ new/yast2-vm-2.13.47/src/VM_XEN.ycp 2006-05-16 00:52:06.000000000 +0200
@@ -3,7 +3,7 @@
* Package: XEN specific functions and values
* Authors: Ladislav Slezak
* Michael G. Fritch
- * $Id: VM_XEN.ycp 30792 2006-05-10 02:00:13Z mgfritch $
+ * $Id: VM_XEN.ycp 30923 2006-05-15 22:51:58Z mgfritch $
*/
{
module "VM_XEN";
@@ -1111,8 +1111,12 @@
retmap["stdout"] = deletechars(retmap["stdout"]:"", "\n\t "); // remove whitespace
y2milestone("retmap=%1", retmap);
if (retmap["stdout"]:"" != nil && retmap["stdout"]:"" != "") {
- if (regexpmatch(retmap["stdout"]:"", ".*xenpae$"))
+ if (regexpmatch(retmap["stdout"]:"", ".*xenpae$")) // check for kernel-xenpae
isPAE = true;
+ else if (regexpmatch(retmap["stdout"]:"", ".*bigsmp$")) // check for kernel-bigsmp
+ isPAE = true;
+ else
+ isPAE = false;
}
y2milestone("isPAE=%1", isPAE);
return isPAE;
@@ -1162,8 +1166,8 @@
VM_Common::SetKernelImage("/boot/vmlinuz-" + kernel_ext);
VM_Common::SetInitrdImage("/boot/initrd-" + kernel_ext);
- // Search each disk for the existance of the Xen Linux kernel, initrd, or inittab.
- // If one is found then set VM_Common::root_device to that disk partition.
+ // Search each disk for the existance of the Xen Linux kernel and initrd.
+ // If one is found then set VM_Common::root_device to that disk partition.
ReadDiskImages(img_prefix + VM_Common::config_name);
}
y2milestone("KernelImage: %1", VM_Common::GetKernelImage);
@@ -1474,8 +1478,8 @@
ret = ret && WriteStringOption(configpath, "boot", boot_device);
// write CD-ROM configuration if booting from a CD
- if (boot_device == "d")
- {
+// if (boot_device == "d") {
+ if (VM_Common::proposal_type != "existing") {
ret = ret && WriteStringOption(configpath, "cdrom", cdrom_image);
}
}
@@ -1865,10 +1869,13 @@
return false;
}
+
y2milestone("Extracting %1%2 from the installation source...", "kernel-", kernel_ext);
string kpkg = VM_Common::GetPackage("kernel-" + kernel_ext);
string tmpdir = VM_Common::GetTmpDir();
+
+
kernel_path = VM_Common::ExtractKernelImage(kpkg, tmpdir, "./boot/vmlinuz-*-" + kernel_ext, "vmlinuz-*-" + kernel_ext);
if (kernel_path != "")
@@ -1886,6 +1893,7 @@
return false;
}
+
y2milestone("Creating installation ramdisk (initrd)...");
if (VM_Common::CreateInstallationImage(kpkg, tmpdir + "/inst-initrd") == false)
{
@@ -1894,7 +1902,11 @@
return false;
}
initrd_path = tmpdir + "/inst-initrd";
+
y2milestone("kernel: %1, initrd: %2", kernel_path, initrd_path);
+
+ VM_Common::GetPackage("kernel-" + kernel_ext); // ask for the kernel pkg again. This ensures CD1 is in the drive when the VM starts. See bugzilla #175111
+
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.46/src/dom0_setup.ycp new/yast2-vm-2.13.47/src/dom0_setup.ycp
--- old/yast2-vm-2.13.46/src/dom0_setup.ycp 2006-04-07 21:00:50.000000000 +0200
+++ new/yast2-vm-2.13.47/src/dom0_setup.ycp 2006-05-16 00:52:06.000000000 +0200
@@ -5,7 +5,7 @@
*
* Purpose: Configure domain0 (Xen management domain)
*
- * $Id: dom0_setup.ycp 29853 2006-04-07 06:35:57Z lslezak $
+ * $Id: dom0_setup.ycp 30923 2006-05-15 22:51:58Z mgfritch $
*/
{
@@ -14,6 +14,7 @@
import "Report";
import "Popup";
import "Wizard";
+ import "VM_XEN";
textdomain "vm";
@@ -67,7 +68,13 @@
// package stage
Progress::NextStage();
+ // Decide if dom0 should use the pae kernel (#175117)
+ string kernel_pkg = "kernel-xen";
+ if (VM_XEN::isPAEKernel())
+ kernel_pkg = "kernel-xenpae";
+
list<string> packages = ["xen", "kernel-xen", "xen-libs", "xen-tools", "xen-tools-ioemu"];
+ packages = add(packages, kernel_pkg);
boolean success = true;
boolean bootloader_modified = false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.46/src/inst_vm_manage.ycp new/yast2-vm-2.13.47/src/inst_vm_manage.ycp
--- old/yast2-vm-2.13.46/src/inst_vm_manage.ycp 2006-05-06 00:30:53.000000000 +0200
+++ new/yast2-vm-2.13.47/src/inst_vm_manage.ycp 2006-05-12 17:41:21.000000000 +0200
@@ -73,8 +73,11 @@
// remove the disk source
if (remove_disk) {
y2milestone("removing virtual disk: %1", src);
- boolean isremoved = (boolean) SCR::Execute(.target.remove, src);
- if (! isremoved) success = false;
+ string cmd = sformat("rm -f %1", src);
+ y2milestone("Executing: %1", cmd);
+ map retmap = (map)SCR::Execute(.target.bash_output, cmd);
+ y2milestone("retmap=%1", retmap);
+ if (retmap["exit"]:-1 != 0) success = false;
}
});
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...