Hello community, here is the log from the commit of package yast2-vm for openSUSE:Factory checked in at 2013-06-07 10:27:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-vm (Old) and /work/SRC/openSUSE:Factory/.yast2-vm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-vm" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-vm/yast2-vm.changes 2013-05-02 12:08:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-vm.new/yast2-vm.changes 2013-06-07 10:27:53.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Jun 6 13:18:55 MDT 2013 - [email protected] + +- Update packages to be installed based on libvirt package changes. +- 2.23.0 + +------------------------------------------------------------------- +Thu May 2 12:55:18 MDT 2013 - [email protected] + +- bnc#817943 - Selecting some virtualization packages during + install is causing bridged networking to be set up (s390x) + +------------------------------------------------------------------- Old: ---- yast2-vm-2.22.6.tar.bz2 New: ---- yast2-vm-2.23.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-vm.spec ++++++ --- /var/tmp/diff_new_pack.3xJoRL/_old 2013-06-07 10:27:54.000000000 +0200 +++ /var/tmp/diff_new_pack.3xJoRL/_new 2013-06-07 10:27:54.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-vm -Version: 2.22.6 +Version: 2.23.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-vm-2.22.6.tar.bz2 -> yast2-vm-2.23.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-2.22.6/VERSION new/yast2-vm-2.23.0/VERSION --- old/yast2-vm-2.22.6/VERSION 2013-05-01 19:01:35.000000000 +0200 +++ new/yast2-vm-2.23.0/VERSION 2013-06-06 21:31:36.000000000 +0200 @@ -1 +1 @@ -2.22.6 +2.23.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-2.22.6/configure new/yast2-vm-2.23.0/configure --- old/yast2-vm-2.22.6/configure 2013-05-01 19:01:46.000000000 +0200 +++ new/yast2-vm-2.23.0/configure 2013-06-07 00:21:47.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-vm 2.22.6. +# Generated by GNU Autoconf 2.69 for yast2-vm 2.23.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-vm' PACKAGE_TARNAME='yast2-vm' -PACKAGE_VERSION='2.22.6' -PACKAGE_STRING='yast2-vm 2.22.6' +PACKAGE_VERSION='2.23.0' +PACKAGE_STRING='yast2-vm 2.23.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1247,7 +1247,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.22.6 to adapt to many kinds of systems. +\`configure' configures yast2-vm 2.23.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1318,7 +1318,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-vm 2.22.6:";; + short | recursive ) echo "Configuration of yast2-vm 2.23.0:";; esac cat <<\_ACEOF @@ -1398,7 +1398,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-vm configure 2.22.6 +yast2-vm configure 2.23.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1415,7 +1415,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.22.6, which was +It was created by yast2-vm $as_me 2.23.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2354,7 +2354,7 @@ # Define the identity of the package. PACKAGE='yast2-vm' - VERSION='2.22.6' + VERSION='2.23.0' cat >>confdefs.h <<_ACEOF @@ -2477,7 +2477,7 @@ -VERSION="2.22.6" +VERSION="2.23.0" RPMNAME="yast2-vm" MAINTAINER="Charles Arnold <[email protected]>" @@ -3410,7 +3410,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-vm $as_me 2.22.6, which was +This file was extended by yast2-vm $as_me 2.23.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3463,7 +3463,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-vm config.status 2.22.6 +yast2-vm config.status 2.23.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-2.22.6/configure.in new/yast2-vm-2.23.0/configure.in --- old/yast2-vm-2.22.6/configure.in 2013-05-01 19:01:42.000000000 +0200 +++ new/yast2-vm-2.23.0/configure.in 2013-06-07 00:21:44.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-vm, 2.22.6, http://bugs.opensuse.org/, yast2-vm) +AC_INIT(yast2-vm, 2.23.0, http://bugs.opensuse.org/, yast2-vm) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.22.6" +VERSION="2.23.0" RPMNAME="yast2-vm" MAINTAINER="Charles Arnold <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-2.22.6/src/VM_XEN.ycp new/yast2-vm-2.23.0/src/VM_XEN.ycp --- old/yast2-vm-2.22.6/src/VM_XEN.ycp 2013-05-01 19:01:35.000000000 +0200 +++ new/yast2-vm-2.23.0/src/VM_XEN.ycp 2013-06-07 00:21:35.000000000 +0200 @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------------ - * Copyright (c) 2007 Novell, Inc. All Rights Reserved. + * Copyright (c) 2013 Novell, Inc. All Rights Reserved. * * * This program is free software; you can redistribute it and/or modify it under @@ -230,20 +230,19 @@ Progress::NextStage(); // Common packages to both Xen and KVM - list<string> packages = ["libvirt", "libvirt-python", "vm-install"]; + list<string> packages = ["libvirt-python", "vm-install"]; if ( install_xen ) { + packages = add(packages, "libvirt-daemon-xen"); packages = add(packages, "xen"); + packages = add(packages, "xen-libs"); packages = add(packages, "xen-tools"); packages = add(packages, "kernel-xen"); } if ( install_kvm ) { + packages = add(packages, "libvirt-daemon-qemu"); packages = add(packages, "kvm"); } - if ( is_s390 == false ) { - // There is a hard dependency in libvirt for xen-libs even if kvm only except on s390 - packages = add(packages, "xen-libs"); - } boolean inst_gui = true; @@ -291,42 +290,65 @@ } } - // Default Bridge stage - Progress::NextStage(); + if ( is_s390 == false ) { + // Default Bridge stage + Progress::NextStage(); - Progress::Title(_("Configuring Default Network Bridge...")); + Progress::Title(_("Configuring Default Network Bridge...")); - // Check for the existance of /sys/class/net/*/bridge - list<string> interfaces = (list<string>)SCR::Read(.target.dir, net_path); - // foreach (map<string,any> i, interfaces, ``{ - foreach (string i, interfaces, ``{ - y2milestone("Checking for bridges..."); - bridge_path = net_path + "/" + i + "/bridge"; - if (SCR::Read(.target.dir, bridge_path) >= 0) { - y2milestone("Dom0 already has a configured bridge."); - bridge_exists = true; - break; + // Check for the existance of /sys/class/net/*/bridge + list<string> interfaces = (list<string>)SCR::Read(.target.dir, net_path); + foreach (string i, interfaces, ``{ + y2milestone("Checking for bridges..."); + bridge_path = net_path + "/" + i + "/bridge"; + if (SCR::Read(.target.dir, bridge_path) >= 0) { + y2milestone("Dom0 already has a configured bridge."); + bridge_exists = true; + break; + } + }); + + // Popup yes/no dialog + if ( bridge_exists == false ) { + if ( Popup::AnyQuestionRichText(_("Network Bridge."), + _("<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>"), + 45, 5, Label::YesButton(), Label::NoButton(), `focus_yes) ) { + y2milestone("Configuring default bridge for Xen or KVM..."); + WFM::call("lan_proposal", ["MakeProposal"]); + UI::OpenDialog(`VBox()); + WFM::call("lan_proposal", ["Write"]); + UI::CloseDialog(); } - }); + } - // Popup yes/no dialog - if ( bridge_exists == false ) { - if ( Popup::AnyQuestionRichText(_("Network Bridge."), - _("<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>"), - 45, 5, Label::YesButton(), Label::NoButton(), `focus_yes) ) { - y2milestone("Configuring default bridge for Xen or KVM..."); - WFM::call("lan_proposal", ["MakeProposal"]); - UI::OpenDialog(`VBox()); - WFM::call("lan_proposal", ["Write"]); - UI::CloseDialog(); + // Enable the libvirtd daemon if openSUSE + if ( isOpenSuse() == true ) { + string cmd = "systemctl enable libvirtd.service"; + y2milestone("Executing: %1", cmd); + SCR::Execute(.target.bash, cmd); } } - - // Enable the libvirtd daemon if openSUSE - if ( isOpenSuse() == true ) { - string cmd = "systemctl enable libvirtd.service"; - y2milestone("Executing: %1", cmd); - SCR::Execute(.target.bash, cmd); + else { + // For s390, make sure /etc/zipl.conf contain switch_amode + string def_section = Bootloader::getDefaultSection(); + string switch_amode = Bootloader::getKernelParam(def_section, "switch_amode"); + if ( switch_amode == "false" ) + { + boolean zipl_updated = false; + y2milestone("No switch_amode kernel boot parameter in /etc/zipl.conf, adding ..."); + if (Bootloader::setKernelParam(def_section, "switch_amode", "true") == true) { + if (Bootloader::Write() == true) { + zipl_updated = true; + string cmd = "/sbin/zipl"; + y2milestone("Executing: %1", cmd); + SCR::Execute(.target.bash, cmd); + y2milestone("Successful update of /etc/zipl.conf with the switch_amode kernel boot parameter"); + } + } + if (zipl_updated == false) { + y2milestone("Failed to correctly update /etc/zipl.conf with switch_amode kernel boot parameter"); + } + } } // Firewall stage - modify the firewall setting, add the xen bridge to FW_FORWARD_ALWAYS_INOUT_DEV -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
