Hello community,
here is the log from the commit of package yast2-vm
checked in at Wed May 10 10:30:52 CEST 2006.
--------
--- yast2-vm/yast2-vm.changes 2006-05-08 17:46:41.000000000 +0200
+++ STABLE/yast2-vm/yast2-vm.changes 2006-05-10 04:01:27.000000000 +0200
@@ -1,0 +2,14 @@
+Tue May 9 16:14:30 MDT 2006 - mgfritch@novell.com
+
+- Default the root device if a disk partition contains the
+ Xen Linux kernel and ramdisk. (#162593)
+- When a NetWare kernel is detected, set the 'DISPLAY=' value to
+ the IP address of the network interface assigned to the default
+ route in the IP routing table. (#173594)
+- Do not display the message 'Installation will be aborted' when
+ we are not installing a virtual machine. (#173991)
+- Remove any inst sources that were added to the disk configuration
+ when switching virtualization mode. (#171696)
+- 2.13.46
+
+-------------------------------------------------------------------
Old:
----
yast2-vm-2.13.45.tar.bz2
New:
----
yast2-vm-2.13.46.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-vm.spec ++++++
--- /var/tmp/diff_new_pack.PXTG9L/_old 2006-05-10 10:30:40.000000000 +0200
+++ /var/tmp/diff_new_pack.PXTG9L/_new 2006-05-10 10:30:40.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-vm (Version 2.13.45)
+# spec file for package yast2-vm (Version 2.13.46)
#
# 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.45
+Version: 2.13.46
Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-vm-2.13.45.tar.bz2
+Source0: yast2-vm-2.13.46.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.45
+%setup -n yast2-vm-2.13.46
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,17 @@
%doc %{prefix}/share/doc/packages/yast2-vm
%changelog -n yast2-vm
+* Tue May 09 2006 - mgfritch@novell.com
+- Default the root device if a disk partition contains the
+ Xen Linux kernel and ramdisk. (#162593)
+- When a NetWare kernel is detected, set the 'DISPLAY=' value to
+ the IP address of the network interface assigned to the default
+ route in the IP routing table. (#173594)
+- Do not display the message 'Installation will be aborted' when
+ we are not installing a virtual machine. (#173991)
+- Remove any inst sources that were added to the disk configuration
+ when switching virtualization mode. (#171696)
+- 2.13.46
* Mon May 08 2006 - mgfritch@novell.com
- Enable the Write portion of vm_finish.ycp if Arch::is_xenU()
and when `installation, `update, or `autoinst.
++++++ yast2-vm-2.13.45.tar.bz2 -> yast2-vm-2.13.46.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.45/VERSION new/yast2-vm-2.13.46/VERSION
--- old/yast2-vm-2.13.45/VERSION 2006-05-08 17:09:57.000000000 +0200
+++ new/yast2-vm-2.13.46/VERSION 2006-05-10 00:14:26.000000000 +0200
@@ -1 +1 @@
-2.13.45
+2.13.46
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.45/configure new/yast2-vm-2.13.46/configure
--- old/yast2-vm-2.13.45/configure 2006-05-08 17:41:36.000000000 +0200
+++ new/yast2-vm-2.13.46/configure 2006-05-10 02:15:45.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.45.
+# Generated by GNU Autoconf 2.59 for yast2-vm 2.13.46.
#
# 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.45'
-PACKAGE_STRING='yast2-vm 2.13.45'
+PACKAGE_VERSION='2.13.46'
+PACKAGE_STRING='yast2-vm 2.13.46'
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.45 to adapt to many kinds of systems.
+\`configure' configures yast2-vm 2.13.46 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.45:";;
+ short | recursive ) echo "Configuration of yast2-vm 2.13.46:";;
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.45
+yast2-vm configure 2.13.46
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.45, which was
+It was created by yast2-vm $as_me 2.13.46, 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.45'
+ VERSION='2.13.46'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.45"
+VERSION="2.13.46"
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.45, which was
+This file was extended by yast2-vm $as_me 2.13.46, 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.45
+yast2-vm config.status 2.13.46
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.45/configure.in new/yast2-vm-2.13.46/configure.in
--- old/yast2-vm-2.13.45/configure.in 2006-05-08 17:41:27.000000000 +0200
+++ new/yast2-vm-2.13.46/configure.in 2006-05-10 02:15:37.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.45, http://www.suse.de/feedback, yast2-vm)
+AC_INIT(yast2-vm, 2.13.46, 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.45"
+VERSION="2.13.46"
RPMNAME="yast2-vm"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.45/src/VM_Common.ycp new/yast2-vm-2.13.46/src/VM_Common.ycp
--- old/yast2-vm-2.13.45/src/VM_Common.ycp 2006-05-06 01:00:06.000000000 +0200
+++ new/yast2-vm-2.13.46/src/VM_Common.ycp 2006-05-10 04:00:22.000000000 +0200
@@ -4,7 +4,7 @@
* Authors: Ladislav Slezak
* Michael G. Fritch
*
- * $Id: VM_Common.ycp 30722 2006-05-05 22:59:43Z mgfritch $
+ * $Id: VM_Common.ycp 30792 2006-05-10 02:00:13Z mgfritch $
*/
{
module "VM_Common";
@@ -390,6 +390,30 @@
return sid;
}
+
+ global string GetDefaultRouteInterface() {
+ // grab the default route from the route table
+ string cmd = "/sbin/route | /usr/bin/grep -E '^default'";
+ y2milestone("Executing: %1", cmd);
+ map out = (map)SCR::Execute(.target.bash_output, cmd);
+ y2milestone("route output: %1", out);
+
+ // get the interface assigned to the default route
+ list<string> output = splitstring(out["stdout"]:"", " \t\n");
+ output = filter(string tmpstr, output, ``(tmpstr != nil && tmpstr != ""));
+ y2milestone("output=%1", output);
+ string default_interface = output[size(output)-1]:"";
+ default_interface = String::CutBlanks(default_interface);
+ y2milestone("default_interface=%1", default_interface);
+
+ // default to eth0 if an error occurs
+ if (default_interface == nil || default_interface == "")
+ default_interface = "eth0";
+
+ y2milestone("GetDefaultRouteInterface returned '%1'", default_interface);
+ return default_interface;
+ }
+
global boolean IsNetWareKernel(string kernel)
{
list<string> names = splitstring(kernel, "/");
@@ -412,12 +436,23 @@
y2milestone("display_list=%1", display_list);
// Add display=
if (display_list[1]:"" == nil || display_list[1]:"" == "" || display_list[1]:"" == "localhost" || display_list[1]:"" == "127.0.0.1") {
- // get the IP address of the 1st interface
+
+ // get the inferface assigned to the default route
+ string default_interface = GetDefaultRouteInterface();
+
+ // get the IP address of the interface used in the default route
import "IP";
list<map> ifconfig =(list<map>)SCR::Read(.run.ifconfig);
- ifconfig = filter(map iface, ifconfig, ``( iface["name"]:"" == "eth0"));
+ ifconfig = filter(map iface, ifconfig, ``( iface["name"]:"" == default_interface));
integer ipint = ifconfig[0,"value", "inet", "addr"]:0;
- args = args + sformat(" DISPLAY=%1:%2", IP::ToString(ipint), display_list[2]:"0");
+ if (ipint != nil && ipint > 0) {
+ args = args + sformat(" DISPLAY=%1:%2", IP::ToString(ipint), display_list[2]:"0");
+ }
+ else {
+ // use the display value as is...
+ args = args + display_value;
+ }
+
}
else {
// use the display value as is...
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.45/src/VM_XEN.ycp new/yast2-vm-2.13.46/src/VM_XEN.ycp
--- old/yast2-vm-2.13.45/src/VM_XEN.ycp 2006-05-06 01:00:06.000000000 +0200
+++ new/yast2-vm-2.13.46/src/VM_XEN.ycp 2006-05-10 04:00:22.000000000 +0200
@@ -3,7 +3,7 @@
* Package: XEN specific functions and values
* Authors: Ladislav Slezak
* Michael G. Fritch
- * $Id: VM_XEN.ycp 30722 2006-05-05 22:59:43Z mgfritch $
+ * $Id: VM_XEN.ycp 30792 2006-05-10 02:00:13Z mgfritch $
*/
{
module "VM_XEN";
@@ -82,6 +82,14 @@
global boolean resetMemorySize()
{
VM_Common::memory_size = VM_Common::default_memory_size;
+
+ boolean isNetWare = false;
+ if (VM_Common::GetCustomKernel()) {
+ isNetWare = VM_Common::IsNetWareKernel(VM_Common::GetKernelImage());
+ }
+ if (isNetWare && VM_Common::proposal_type != "install")
+ VM_Common::memory_size = 512; // if NetWare, increase the memory_size=512
+
return true;
}
@@ -762,11 +770,203 @@
return $["cdrom_image":cdrom_image, "boot_device":boot_device];
}
+
+ define list<string> PartitionsInfo(string image) {
+ string cmd = sformat("sfdisk -d -uS -- '%1'", image);
+ map outputmap = (map)SCR::Execute(.target.bash_output, cmd);
+
+ string outputstring = outputmap["stdout"]:"";
+
+ list<string> ret = [];
+
+ if (outputstring != nil && outputstring != "")
+ {
+ ret = splitstring(outputstring, "\n");
+ // remove empty lines
+ ret = filter(string f, ret, {return f != nil && f != "";});
+ }
+
+ y2milestone("PartitionsInfo (%1): %2", image, ret);
+
+ return ret;
+ }
+
+ define list