Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory
checked in at Fri Jan 7 10:31:00 CET 2011.
--------
--- yast2-network/yast2-network.changes 2010-11-26 14:15:42.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2011-01-03 17:20:38.000000000 +0100
@@ -1,0 +2,30 @@
+Thu Dec 23 00:32:23 CET 2010 - mzugec@suse.cz
+
+- ifcfg-ethX.Y style config files for VLAN(fate#309240)
+- 2.20.10
+
+-------------------------------------------------------------------
+Mon Dec 20 11:37:02 CET 2010 - mzugec@suse.cz
+
+- fate#306855: FCoE boot support
+- 2.20.9
+
+-------------------------------------------------------------------
+Fri Dec 17 10:57:38 CET 2010 - mzugec@suse.cz
+
+- L3: don't propose bridge for vbox (bnc#648044)
+- 2.20.8
+
+-------------------------------------------------------------------
+Mon Dec 6 16:13:04 CET 2010 - mzugec@suse.cz
+
+- L3: AY Layer2 support - fixed portname option (bnc#573607)
+- 2.20.7
+
+-------------------------------------------------------------------
+Thu Dec 2 10:07:43 CET 2010 - mzugec@suse.cz
+
+- removed obsolete 50-ipv6.conf (bnc#632530)
+- 2.20.6
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-network-2.20.5.tar.bz2
New:
----
yast2-network-2.20.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.yGsRa3/_old 2011-01-07 10:30:21.000000000 +0100
+++ /var/tmp/diff_new_pack.yGsRa3/_new 2011-01-07 10:30:21.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-network (Version 2.20.5)
+# spec file for package yast2-network (Version 2.20.10)
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,11 +19,11 @@
Name: yast2-network
-Version: 2.20.5
+Version: 2.20.10
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.20.5.tar.bz2
+Source0: yast2-network-2.20.10.tar.bz2
Prefix: /usr
@@ -73,7 +73,7 @@
This package contains autogenerated documentation for yast2-network
%prep
-%setup -n yast2-network-2.20.5
+%setup -n yast2-network-2.20.10
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-network-2.20.5.tar.bz2 -> yast2-network-2.20.10.tar.bz2 ++++++
++++ 11085 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-network-2.20.5/configure.in new/yast2-network-2.20.10/configure.in
--- old/yast2-network-2.20.5/configure.in 2010-02-09 15:48:20.000000000 +0100
+++ new/yast2-network-2.20.10/configure.in 2011-01-03 17:08:29.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.19.10, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.20.10, 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.19.10"
+VERSION="2.20.10"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
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-network-2.20.5/src/clients/lan_proposal.ycp new/yast2-network-2.20.10/src/clients/lan_proposal.ycp
--- old/yast2-network-2.20.5/src/clients/lan_proposal.ycp 2010-05-27 14:00:38.000000000 +0200
+++ new/yast2-network-2.20.10/src/clients/lan_proposal.ycp 2010-12-20 15:31:58.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Lan configuration proposal
* Authors: Michal Svec
*
- * $Id: lan_proposal.ycp 62071 2010-05-27 12:00:38Z mzugec $
+ * $Id: lan_proposal.ycp 63004 2010-12-17 09:59:53Z mzugec $
*/
{
@@ -52,7 +52,7 @@
Lan::Read (force_reset? `nocache: `cache);
if (Lan::virt_net_proposal==nil){
if((PackageSystem::Installed("xen") && !Arch::is_xenU()) || PackageSystem::Installed("kvm")||
- PackageSystem::Installed("qemu") || PackageSystem::Installed("virtualbox-ose"))
+ PackageSystem::Installed("qemu"))
Lan::virt_net_proposal = true;
else Lan::virt_net_proposal = false;
}
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-network-2.20.5/src/clients/save_network.ycp new/yast2-network-2.20.10/src/clients/save_network.ycp
--- old/yast2-network-2.20.5/src/clients/save_network.ycp 2010-11-08 15:17:07.000000000 +0100
+++ new/yast2-network-2.20.10/src/clients/save_network.ycp 2010-12-20 15:31:58.000000000 +0100
@@ -266,6 +266,20 @@
network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration);
}
break;
+ case 3: // FCoE case - create VLAN configuration
+ map cmd = (map) SCR::Execute(.target.bash_output,
+ "ls -la /sys/block/*|grep target|grep eth|cut -d'>' -f2|cut -d'/' -f5|uniq");
+ y2internal("cmd %1", cmd);
+ if (cmd["exit"]:-1==0){
+ string ifcfg = splitstring(cmd["stdout"]:"", "\n")[0]:"";
+ y2internal("ifcfg: %1", ifcfg);
+ string config=sformat("BOOTPROTO=\"static\"\nSTARTMODE=\"nfsroot\"
+ETHERDEVICE=\"%1\"\nUSERCONTROL=\"no\"\n", splitstring(ifcfg, ".")[0]:"");
+ y2internal("config: %1", config);
+ string config_file=sformat("/etc/sysconfig/network/ifcfg-%1", ifcfg);
+ y2internal("filename: %1", config_file);
+ SCR::Write(.target.string, config_file, config);
+ } else y2error("Command failed.");
case 2:
network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration);
break;
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-network-2.20.5/src/lan/address.ycp new/yast2-network-2.20.10/src/lan/address.ycp
--- old/yast2-network-2.20.5/src/lan/address.ycp 2010-11-16 16:14:09.000000000 +0100
+++ new/yast2-network-2.20.10/src/lan/address.ycp 2011-01-03 16:00:07.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Network card adresss configuration dialogs
* Authors: Michal Svec
*
- * $Id: address.ycp 62859 2010-11-16 10:14:11Z mzugec $
+ * $Id: address.ycp 63021 2010-12-22 23:32:50Z mzugec $
*/
{
@@ -126,6 +126,7 @@
void InitVLANSlave(string key)
{
settings["ETHERDEVICE"] = NetworkInterfaces::Current["ETHERDEVICE"]:"";
+ settings["VLAN_ID"] = tointeger(NetworkInterfaces::Current["VLAN_ID"]:"0");
list items = [];
// unconfigured devices
@@ -143,10 +144,21 @@
items = add (items, `item(`id(devname), sformat("%1 - %2", devname, configurations[devtype, devname, "NAME"]:""), settings["ETHERDEVICE"]:""==devname) );
});
});
- UI::ChangeWidget(`id(key), `Items, items);
+ UI::ChangeWidget(`id(`vlan_eth), `Items, items);
+ UI::ChangeWidget(`id(`vlan_id), `Value, settings["VLAN_ID"]:0);
}
+symbol HandleVLANSlave(string key, map event){
+ if (event["EventReason"]:""=="ValueChanged"){
+ string configname = sformat("%1.%2", UI::QueryWidget(`id(`vlan_eth), `Value), UI::QueryWidget(`id(`vlan_id), `Value));
+ NetworkInterfaces::Name = configname;
+ LanItems::Items[LanItems::current, "ifcfg"]= configname;
+ UI::ChangeWidget(`id("IFCFGID"), `Value, configname);
+ }
+ return nil;
+}
+
/**
* Default function to store the value of ETHERDEVICE devices box.
@@ -155,7 +167,8 @@
*/
void StoreVLANSlave(string key, map event)
{
- settings["ETHERDEVICE"] = (string)UI::QueryWidget (`id(key), `Value);
+ settings["ETHERDEVICE"] = (string)UI::QueryWidget (`id(`vlan_eth), `Value);
+ settings["VLAN_ID"] = UI::QueryWidget (`id(`vlan_id), `Value);
}
@@ -733,11 +746,15 @@
"help": help["bridge_ports"]:"",
],
"ETHERDEVICE": $[
- "widget": `combobox,
- "label": _("Real Interface for &VLAN"),
- "items" : [ ],
+ "widget": `custom,
+ "custom_widget":
+ `HBox(
+ `ComboBox(`id(`vlan_eth), `opt(`notify), _("Real Interface for &VLAN"), []),
+ `IntField(`id(`vlan_id), `opt(`notify), _("VLAN id"), 0, 9999, 0)
+ ),
"opt": [`hstretch],
"init": InitVLANSlave,
+ "handle": HandleVLANSlave,
"store": StoreVLANSlave,
"help": help["etherdevice"]:"",
],
@@ -1005,7 +1022,7 @@
// interface types. It will work in some cases, like
// overriding eth to wlan but not in others where we would
// need to change the contents of the dialog. #30890.
- "IFCFGTYPE",
+ LanItems::type!="vlan" ? "IFCFGTYPE" : `Empty(),
`HSpacing(1.5),
`MinWidth(30, "IFCFGID"),
`HSpacing(0.5),
@@ -1260,6 +1277,9 @@
if (LanItems::type == "vlan"){
LanItems::vlan_etherdevice = settings["ETHERDEVICE"]:"";
+y2internal("%1, %2", LanItems::vlan_id, (integer)settings["VLAN_ID"]:0);
+ LanItems::vlan_id = tostring((integer)settings["VLAN_ID"]:0);
+y2internal("%1", LanItems::vlan_id);
} else if (LanItems::type == "br"){
LanItems::bridge_ports = settings["BRIDGE_PORTS"]:"";
} else if (contains(["tun", "tap"], LanItems::type)){
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-network-2.20.5/src/lan/hardware.ycp new/yast2-network-2.20.10/src/lan/hardware.ycp
--- old/yast2-network-2.20.5/src/lan/hardware.ycp 2010-03-01 16:54:49.000000000 +0100
+++ new/yast2-network-2.20.10/src/lan/hardware.ycp 2011-01-03 16:00:07.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Hardware dialogs
* Authors: Michal Svec
*
- * $Id: hardware.ycp 60925 2010-02-22 09:18:46Z mzugec $
+ * $Id: hardware.ycp 63021 2010-12-22 23:32:50Z mzugec $
*/
{
@@ -530,6 +530,10 @@
y2milestone("interface without hwinfo, proposing STARTMODE=auto");
LanItems::startmode="auto";
}
+ if (LanItems::type=="vlan"){
+ string vlanid=(string) UI::QueryWidget(`id(`num), `Value);
+ NetworkInterfaces::Current["VLAN_ID"] = vlanid;
+ }
}
string driver = (string) UI::QueryWidget(`modul, `Value);
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-network-2.20.5/src/modules/LanItems.ycp new/yast2-network-2.20.10/src/modules/LanItems.ycp
--- old/yast2-network-2.20.5/src/modules/LanItems.ycp 2010-11-26 14:11:34.000000000 +0100
+++ new/yast2-network-2.20.10/src/modules/LanItems.ycp 2011-01-03 16:00:06.000000000 +0100
@@ -85,6 +85,7 @@
// VLAN option
global string vlan_etherdevice="";
+global string vlan_id="";
// interfaces attached to bridge (list delimited by ' ')
global string bridge_ports="";
@@ -832,6 +833,7 @@
usercontrol = GetDeviceVar (devmap, defaults, "USERCONTROL") == "yes";
description = GetDeviceVar (devmap, defaults, "NAME");
bond_option = GetDeviceVar(devmap, defaults, "BONDING_MODULE_OPTS");
+ vlan_id = GetDeviceVar(devmap, defaults, "VLAN_ID");
bond_slaves=[];
foreach(any key, any value, devmap,
@@ -1063,7 +1065,9 @@
newdev["NAME"] = description;
// L3: bnc#585458
// if (!issubstring(Items[current, "ifcfg"]:"", type)) newdev["INTERFACETYPE"]=type;
- if (deletechars(Items[current, "ifcfg"]:"", "0123456789")!=type) newdev["INTERFACETYPE"]=type;
+ // exception for VLAN
+ // because of ethX.Y
+// if (deletechars(Items[current, "ifcfg"]:"", "0123456789")!=type && type!="vlan") newdev["INTERFACETYPE"]=type;
if(hotplug == "pcmcia") newdev["DHCLIENT_SET_DOWN_LINK"] = "yes";
@@ -1092,6 +1096,7 @@
if (type=="vlan"){
newdev["ETHERDEVICE"]=vlan_etherdevice;
+ newdev["VLAN_ID"]=vlan_id;
}
if (type=="br"){
newdev["BRIDGE_PORTS"]=bridge_ports;
@@ -1158,6 +1163,7 @@
}
NetworkInterfaces::Name = Items[current, "ifcfg"]:"";
NetworkInterfaces::Current = newdev;
+y2internal("%1", newdev);
if (!NetworkInterfaces::Commit()) Items[current, "ifcfg"]="";
}
else {
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-network-2.20.5/src/modules/LanUdevAuto.ycp new/yast2-network-2.20.10/src/modules/LanUdevAuto.ycp
--- old/yast2-network-2.20.5/src/modules/LanUdevAuto.ycp 2010-11-16 16:14:09.000000000 +0100
+++ new/yast2-network-2.20.10/src/modules/LanUdevAuto.ycp 2010-12-20 15:31:58.000000000 +0100
@@ -138,6 +138,11 @@
LanItems::chan_mode=rule["router"]:"";
break;
}
+ y2milestone("rule:%1", rule);
+ y2milestone("type:%1", LanItems::type);
+ y2milestone("chanids:%1", LanItems::qeth_chanids);
+ y2milestone("layer2:%1", LanItems::qeth_layer2);
+ y2milestone("portname:%1", LanItems::chan_mode);
LanItems::createS390Device();
y2milestone("rule %1", rule);
});
@@ -188,7 +193,7 @@
AY["s390-devices", device]=$["type":device_type];
if (size(chanids)>0) AY["s390-devices", device, "chanids"]=chanids;
-// if (size(portname)>0) AY[device, "portname"]=portname;
+ if (size(portname)>0) AY["s390-devices", device, "portname"]=portname;
if (size(protocol)>0) AY["s390-devices", device, "protocol"]=protocol;
if (layer2) AY["s390-devices", device, "layer2"]=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-network-2.20.5/src/modules/Lan.ycp new/yast2-network-2.20.10/src/modules/Lan.ycp
--- old/yast2-network-2.20.5/src/modules/Lan.ycp 2010-09-17 11:27:59.000000000 +0200
+++ new/yast2-network-2.20.10/src/modules/Lan.ycp 2010-12-20 15:31:58.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec
*
- * $Id: Lan.ycp 62494 2010-09-17 09:27:58Z mzugec $
+ * $Id: Lan.ycp 63004 2010-12-17 09:59:53Z mzugec $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -149,12 +149,14 @@
"filelist" : ["sysctl.conf"],
"filepath" : "/etc/",
"regexp" : "^[[:space:]]*(net.ipv6.conf.all.disable_ipv6)[[:space:]]*=[[:space:]]*1"
- ],
+ ]
+/*
"module" : $[
"filelist" : ["ipv6", "50-ipv6.conf"],
"filepath" : "/etc/modprobe.d/",
"regexp" : "^[[:space:]]*(install ipv6 /bin/true)"
]
+*/
];
foreach(string which,map method, methods, {
@@ -347,7 +349,7 @@
void writeIPv6(){
// SCR::Write(.target.string, "/etc/modprobe.d/ipv6", sformat("%1install ipv6 /bin/true", ipv6?"#":""));
// uncomment to write to old place (and comment code bellow)
- SCR::Write(.target.string, "/etc/modprobe.d/50-ipv6.conf", sformat("%1install ipv6 /bin/true\n", ipv6?"#":""));
+// SCR::Write(.target.string, "/etc/modprobe.d/50-ipv6.conf", sformat("%1install ipv6 /bin/true\n", ipv6?"#":""));
string filename = "/etc/sysctl.conf";
string sysctl = (string)SCR::Read(.target.string, filename);
string sysctl_row = sformat("%1net.ipv6.conf.all.disable_ipv6 = 1", ipv6?"# ":"");
@@ -710,8 +712,9 @@
// enable ipv6 support
link_v6 = Hyperlink (href_v6, _("Enable IPv6"));
}
+ // no exception needed for virtualbox* (bnc#648044) http://www.virtualbox.org/manual/ch06.html
if ( (PackageSystem::Installed("xen") && !Arch::is_xenU()) || PackageSystem::Installed("kvm")||
- PackageSystem::Installed("qemu")||PackageSystem::Installed("virtualbox-ose")
+ PackageSystem::Installed("qemu")
){
if (virt_net_proposal){
href_virt_net = "virtual-revert";
@@ -836,7 +839,7 @@
// test if we have any virtualization installed
if (virt_net_proposal)
{
- y2milestone("Virtualization [xen|kvm|qemu|virtualbox-ose] detected - will propose virtualization network");
+ y2milestone("Virtualization [xen|kvm|qemu] detected - will propose virtualization network");
// in case of virtualization use special proposal
// collect all interfaces that will be skipped from bridged proposal
list<string> skipped = [];
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-network-2.20.5/VERSION new/yast2-network-2.20.10/VERSION
--- old/yast2-network-2.20.5/VERSION 2010-11-26 14:09:19.000000000 +0100
+++ new/yast2-network-2.20.10/VERSION 2011-01-03 16:00:07.000000000 +0100
@@ -1 +1 @@
-2.20.5
+2.20.10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org