Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory
checked in at 2012-01-17 11:36:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-network (Old)
and /work/SRC/openSUSE:Factory/.yast2-network.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network", Maintainer is "mvid...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes
2012-01-09 11:17:26.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes
2012-01-17 16:17:40.000000000 +0100
@@ -1,0 +2,9 @@
+Thu Jan 12 15:52:47 CET 2012 - mvid...@suse.cz
+
+- AY keep_install_network: merge dns and routing from linuxrc
+ item by item, not just in bulk (bnc#712864).
+- Clarified the label for BOOTPROTO=none: "No Link and IP Setup (
+ Bonding Slaves)" (bnc#737333).
+- 2.22.1
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.22.0.tar.bz2
New:
----
yast2-network-2.22.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.LD6AOn/_old 2012-01-17 16:17:48.000000000 +0100
+++ /var/tmp/diff_new_pack.LD6AOn/_new 2012-01-17 16:17:48.000000000 +0100
@@ -18,7 +18,7 @@
Name: yast2-network
-Version: 2.22.0
+Version: 2.22.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-network-2.22.0.tar.bz2 -> yast2-network-2.22.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-2.22.0/VERSION
new/yast2-network-2.22.1/VERSION
--- old/yast2-network-2.22.0/VERSION 2012-01-06 16:21:02.000000000 +0100
+++ new/yast2-network-2.22.1/VERSION 2012-01-13 16:12:29.000000000 +0100
@@ -1 +1 @@
-2.22.0
+2.22.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-2.22.0/configure
new/yast2-network-2.22.1/configure
--- old/yast2-network-2.22.0/configure 2012-01-06 16:21:06.000000000 +0100
+++ new/yast2-network-2.22.1/configure 2012-01-13 16:12:33.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-network 2.22.0.
+# Generated by GNU Autoconf 2.68 for yast2-network 2.22.1.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.22.0'
-PACKAGE_STRING='yast2-network 2.22.0'
+PACKAGE_VERSION='2.22.1'
+PACKAGE_STRING='yast2-network 2.22.1'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1229,7 +1229,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-network 2.22.0 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.22.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1300,7 +1300,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-network 2.22.0:";;
+ short | recursive ) echo "Configuration of yast2-network 2.22.1:";;
esac
cat <<\_ACEOF
@@ -1380,7 +1380,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.22.0
+yast2-network configure 2.22.1
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1397,7 +1397,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-network $as_me 2.22.0, which was
+It was created by yast2-network $as_me 2.22.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2327,7 +2327,7 @@
# Define the identity of the package.
PACKAGE='yast2-network'
- VERSION='2.22.0'
+ VERSION='2.22.1'
cat >>confdefs.h <<_ACEOF
@@ -2449,7 +2449,7 @@
-VERSION="2.22.0"
+VERSION="2.22.1"
RPMNAME="yast2-network"
MAINTAINER="Martin Vidner <mvid...@suse.cz>"
@@ -3379,7 +3379,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-network $as_me 2.22.0, which was
+This file was extended by yast2-network $as_me 2.22.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3432,7 +3432,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-network config.status 2.22.0
+yast2-network config.status 2.22.1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-2.22.0/configure.in
new/yast2-network-2.22.1/configure.in
--- old/yast2-network-2.22.0/configure.in 2012-01-06 16:21:03.000000000
+0100
+++ new/yast2-network-2.22.1/configure.in 2012-01-13 16:12:30.000000000
+0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.21.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.22.0, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.22.1, http://bugs.opensuse.org/, yast2-network)
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.0"
+VERSION="2.22.1"
RPMNAME="yast2-network"
MAINTAINER="Martin Vidner <mvid...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-2.22.0/src/clients/lan_auto.ycp
new/yast2-network-2.22.1/src/clients/lan_auto.ycp
--- old/yast2-network-2.22.0/src/clients/lan_auto.ycp 2012-01-06
16:21:01.000000000 +0100
+++ new/yast2-network-2.22.1/src/clients/lan_auto.ycp 2012-01-13
16:12:23.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Lan configuration proposal
* Authors: Michal Svec <ms...@suse.cz>
*
- * $Id: lan_auto.ycp 62494 2010-09-17 09:27:58Z mzugec $
+ * $Id: lan_auto.ycp 67193 2012-01-13 14:54:33Z mvidner $
*/
{
@@ -70,27 +70,29 @@
*/
define map FromAY(map input)
{
- y2debug("input %1", input);
+ y2debug("input %1", input);
- list<map<string,any> > ifaces=[];
- foreach(map<string,any> interface, input["interfaces"]:[], {
- map<string,any> iface=$[];
- foreach(string key, any value, interface, {
- if (key == "aliases"){
- foreach(string k, map<string,any > v, (map<string, map<string,any>
>)value, {
- // replace "alias0" to "0" (bnc#372687)
- map<string,any> t = (map<string,any>)value;
- t[v["LABEL"]:""]=t[k]:$[];
- t=remove(t,k);
- value=t;
- });
- } else
- if (key=="device") value = LanUdevAuto::getDeviceName(tostring(value));
- iface[key]=value;
- });
- ifaces = add(ifaces, iface);
- });
- input["interfaces"] = ifaces;
+ list<map<string,any> > ifaces=[];
+ foreach(map<string,any> interface, input["interfaces"]:[], {
+ map<string,any> iface=$[];
+ foreach(string key, any value, interface, {
+ if (key == "aliases"){
+ foreach(string k, map<string,any > v, (map<string,
map<string,any> >)value, {
+ // replace "alias0" to "0" (bnc#372687)
+ map<string,any> t = (map<string,any>)value;
+ t[v["LABEL"]:""]=t[k]:$[];
+ t=remove(t,k);
+ value=t;
+ });
+ }
+ else if (key=="device") {
+ value = LanUdevAuto::getDeviceName(tostring(value));
+ }
+ iface[key]=value;
+ });
+ ifaces = add(ifaces, iface);
+ });
+ input["interfaces"] = ifaces;
map<string,map> interfaces = listmap(map<string, any> interface,
(list<map<string, any> >)input["interfaces"]:[],
@@ -286,29 +288,34 @@
ret = LanAutoSequence("");
}
else if(func == "Import") {
- // see bnc#498993
- // in case keep_install_network is set to true (in AY)
- // and there is no dns and routing definition,
- // we'll keep values from installation
- if(param["keep_install_network"]:false==true) {
- y2milestone("keep_install_network is enabled");
- if(param["dns"]:$[]==$[] && param["routing"]:$[]==$[]){
- y2milestone("DNS and routing are not defined in AY, will keep settings from
installation");
- // read settings from installation
- Lan::Read(`cache);
- // export settings into AY map
- map from_system=Lan::Export();
- map dns=from_system["dns"]:$[];
- map routing=from_system["routing"]:$[];
- // merge with param
- param["dns"]=dns;
- param["routing"]=routing;
- y2milestone("dns %1", dns);
- y2milestone("routing %1", routing);
- } else{
- y2milestone("DNS and routing defined in AY profile, will use it");
- }
- }
+ // see bnc#498993
+ // in case keep_install_network is set to true (in AY)
+ // we'll keep values from installation
+ // and merge with XML data (bnc#712864)
+ if(param["keep_install_network"]:false==true) {
+ // read settings from installation
+ Lan::Read(`cache);
+ // export settings into AY map
+ map from_system=Lan::Export();
+ map dns = from_system["dns"]:$[];
+ map routing = from_system["routing"]:$[];
+
+ // copy the keys/values that are not existing in the XML
+ // so we merge the inst-sys settings with the XML while XML
+ // has higher priority
+ foreach( string key, any value, dns, {
+ if( ! haskey( param["dns"]:$[], key ) ) {
+ y2milestone("(dns) taking %1 from inst-sys. Value = %2", key,
value);
+ param["dns",key] = value;
+ }
+ });
+ foreach( string key, any value, routing, {
+ if( ! haskey( param["routing"]:$[], key ) ) {
+ param["routing",key] = value;
+ y2milestone("(routing) taking %1 from inst-sys. Value = %2",
key, value);
+ }
+ });
+ }
map new = FromAY(param);
Lan::Import(new);
ret = true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-2.22.0/src/lan/address.ycp
new/yast2-network-2.22.1/src/lan/address.ycp
--- old/yast2-network-2.22.0/src/lan/address.ycp 2012-01-06
16:21:02.000000000 +0100
+++ new/yast2-network-2.22.1/src/lan/address.ycp 2012-01-13
16:12:28.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Network card adresss configuration dialogs
* Authors: Michal Svec <ms...@suse.cz>
*
- * $Id: address.ycp 65749 2011-09-16 14:55:45Z mvidner $
+ * $Id: address.ycp 67200 2012-01-13 15:05:54Z mvidner $
*/
{
@@ -323,7 +323,7 @@
else
*/
if (LanItems::type!="eth") UI::ReplaceWidget(`rp, `Left(
- `RadioButton(`id(`none),`opt(`notify), _("No IP Address
(for Bonding Devices)"))));
+ `RadioButton(`id(`none),`opt(`notify), _("No Link and IP
Setup (Bonding Slaves)"))));
switch(settings["BOOTPROTO"]:""){
case "static": UI::ChangeWidget(`id(`bootproto), `CurrentButton, `static);
UI::ChangeWidget(`id(`ipaddr), `Value, settings["IPADDR"]:"");
@@ -781,7 +781,7 @@
`ReplacePoint(`id(`rp),
`Left(
`HBox(
- `RadioButton(`id(`none),`opt(`notify), _("No IP Address
(for Bonding Devices)")),
+ `RadioButton(`id(`none),`opt(`notify), _("No Link and IP
Setup (Bonding Slaves)")),
`HSpacing(1),
`CheckBox(`id(`ibft), `opt(`notify), _("Use iBFT values"))
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-2.22.0/src/lan/hardware.ycp
new/yast2-network-2.22.1/src/lan/hardware.ycp
--- old/yast2-network-2.22.0/src/lan/hardware.ycp 2012-01-06
16:21:02.000000000 +0100
+++ new/yast2-network-2.22.1/src/lan/hardware.ycp 2012-01-13
16:12:28.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Hardware dialogs
* Authors: Michal Svec <ms...@suse.cz>
*
- * $Id: hardware.ycp 64967 2011-07-22 16:09:02Z mvidner $
+ * $Id: hardware.ycp 67193 2012-01-13 14:54:33Z mvidner $
*/
{
@@ -594,7 +594,6 @@
/* TextEntry label */
`InputField(`id(`qeth_macaddress), `opt(`hstretch), _("Layer2
&MAC Address"), LanItems::qeth_macaddress),
`VSpacing(1),
-// `InputField(`id(`qeth_chanids), `opt(`hstretch), _("CHAN IDS"),
LanItems::qeth_chanids)
`HBox(
`InputField(`id(`qeth_chan_read), `opt(`hstretch),
_("Read Channel"), chanids_map["read"]:""),
`InputField(`id(`qeth_chan_write), `opt(`hstretch),
_("Write Channel"), chanids_map["write"]:""),
@@ -612,29 +611,6 @@
_("<p>Enter the <b>Layer 2 MAC Address</b> if this card has been
configured with layer 2 support.</p>");
}
-/*
- if(LanItems::type == "hsi") {
- contents = `HBox(
- `HSpacing(6),
- `Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox(
- `VSpacing(1),
- `InputField(`id(`qeth_options), `opt(`hstretch), Label::Options
(), LanItems::qeth_options),
- `VSpacing(1),
- `Left(`CheckBox(`id(`ipa_takeover), _("&Enable IPA Takeover"))),
- `VSpacing(1),
- `Left(`CheckBox(`id(`qeth_layer2), `opt(`notify), _("Enable
&Layer 2 Support"))),
- `InputField(`id(`qeth_macaddress), `opt(`hstretch), _("Layer2
&MAC Address"), LanItems::qeth_macaddress),
- `VSpacing(1)
- ), `HSpacing(2))),
- `HSpacing(6)
- );
- helptext = _("<p>Enter any additional <b>Options</b> for this interface
(separated by spaces).</p>") +
- _("<p>Select <b>Enable IPA Takeover</b> if IP address takeover should
be enabled for this interface.</p>") +
- _("<p>Select <b>Enable Layer 2 Support</b> if this card has been
configured with layer 2 support.</p>") +
- _("<p>Enter the <b>Layer 2 MAC Address</b> if this card has been
configured with layer 2 support.</p>");
- }
-*/
-
if(drvtype == "lcs") {
list<string> tmp_list=splitstring(LanItems::qeth_chanids, " ");
map<string, any> chanids_map = $[
@@ -767,8 +743,7 @@
LanItems::nm_name = "static-iucv-id-" + (string)
UI::QueryWidget(`id(`chan_mode), `Value);
LanItems::device = "id-" + (string)
UI::QueryWidget(`id(`chan_mode), `Value);
}
-// if (LanItems::type != "hsi")
- LanItems::chan_mode = (string) UI::QueryWidget(`id(`chan_mode),
`Value);
+ LanItems::chan_mode = (string) UI::QueryWidget(`id(`chan_mode),
`Value);
if(LanItems::type == "lcs")
LanItems::lcs_timeout = (string) UI::QueryWidget(`id(`lcs_timeout),
`Value);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-2.22.0/src/modules/LanItems.ycp
new/yast2-network-2.22.1/src/modules/LanItems.ycp
--- old/yast2-network-2.22.0/src/modules/LanItems.ycp 2012-01-06
16:21:02.000000000 +0100
+++ new/yast2-network-2.22.1/src/modules/LanItems.ycp 2012-01-13
16:12:26.000000000 +0100
@@ -975,8 +975,6 @@
global define boolean Select(string dev) {
y2debug("dev=%1", dev);
map devmap = $[];
- /* dev=="" -> Add */
-// if(dev == "") {
// defaults for a new device
devmap = $[
// for hotplug devices set STARTMODE=hotplug (#132583)
@@ -1009,27 +1007,24 @@
type = Items[current, "hwinfo", "type"]:"eth";
device = NetworkInterfaces::GetFreeDevice(type);
-
// TODO: instead of udev use hwinfo dev_name
NetworkInterfaces::Name = GetItemUdev("NAME");
if (size(Items)<current) Items[current] =
$["ifcfg":NetworkInterfaces::Name];
else Items[current, "ifcfg"] = NetworkInterfaces::Name;
-
/* FIXME: alias: how to prefill new alias? */
alias = "";
+
/* general stuff */
description = BuildDescription (type, device, devmap, Hardware);
SetDeviceVars(devmap, SysconfigDefaults);
hotplug = "";
-
y2debug("type=%1", type);
if(issubstring(type, "-")) type = regexpsub(type, "([^-]+)-.*$", "\\1");
y2debug("type=%1", type);
-
/* We always have to set the MAC Address for qeth Layer2 support */
if (qeth_layer2 ) {
qeth_macaddress = devmap["LLADDR"]:"00:00:00:00:00:00";
@@ -1408,9 +1403,7 @@
SetDeviceVars(devmap, SysconfigDefaults);
-
hotplug = "";
-
y2debug("type=%1", type);
if(issubstring(type, "-")) type = regexpsub(type, "([^-]+)-.*$", "\\1");
y2debug("type=%1", type);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
