Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory
checked in at Tue Mar 3 22:50:21 CET 2009.
--------
--- yast2-network/yast2-network.changes 2009-03-02 09:33:22.000000000 +0100
+++ yast2-network/yast2-network.changes 2009-03-03 14:56:32.000000000 +0100
@@ -1,0 +2,17 @@
+Tue Mar 3 14:47:18 CET 2009 - mzugec@suse.cz
+
+- apply forwarding on both IPv4 and IPv6 (bnc#479370)
+- 2.18.15
+
+-------------------------------------------------------------------
+Tue Mar 3 10:13:05 CET 2009 - mzugec@suse.cz
+
+- fixed networking.rnc (bnc#480466)
+- 2.18.14
+
+-------------------------------------------------------------------
+Mon Mar 2 15:41:50 CET 2009 - mzugec@suse.cz
+
+- added help text (bnc#471253)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-network-2.18.13.tar.bz2
New:
----
yast2-network-2.18.15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.Yo5875/_old 2009-03-03 22:48:07.000000000 +0100
+++ /var/tmp/diff_new_pack.Yo5875/_new 2009-03-03 22:48:07.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.18.13)
+# spec file for package yast2-network (Version 2.18.15)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-network
-Version: 2.18.13
+Version: 2.18.15
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.18.13.tar.bz2
+Source0: yast2-network-2.18.15.tar.bz2
Prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -78,7 +78,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.18.13
+%setup -n yast2-network-2.18.15
%build
%{prefix}/bin/y2tool y2autoconf
@@ -142,6 +142,14 @@
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
%exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog
+* Tue Mar 03 2009 mzugec@suse.cz
+- apply forwarding on both IPv4 and IPv6 (bnc#479370)
+- 2.18.15
+* Tue Mar 03 2009 mzugec@suse.cz
+- fixed networking.rnc (bnc#480466)
+- 2.18.14
+* Mon Mar 02 2009 mzugec@suse.cz
+- added help text (bnc#471253)
* Mon Mar 02 2009 mzugec@suse.cz
- Added omitted handling of `hardware symbol in s390 device workflow
(bnc#476490)
++++++ yast2-network-2.18.13.tar.bz2 -> yast2-network-2.18.15.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/configure new/yast2-network-2.18.15/configure
--- old/yast2-network-2.18.13/configure 2009-03-02 09:21:56.000000000 +0100
+++ new/yast2-network-2.18.15/configure 2009-03-03 14:45:48.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-network 2.18.13.
+# Generated by GNU Autoconf 2.63 for yast2-network 2.18.14.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.18.13'
-PACKAGE_STRING='yast2-network 2.18.13'
+PACKAGE_VERSION='2.18.14'
+PACKAGE_STRING='yast2-network 2.18.14'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1274,7 +1274,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.18.13 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.18.14 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1345,7 +1345,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-network 2.18.13:";;
+ short | recursive ) echo "Configuration of yast2-network 2.18.14:";;
esac
cat <<\_ACEOF
@@ -1425,7 +1425,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.18.13
+yast2-network configure 2.18.14
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1439,7 +1439,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.18.13, which was
+It was created by yast2-network $as_me 2.18.14, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2286,7 +2286,7 @@
# Define the identity of the package.
PACKAGE='yast2-network'
- VERSION='2.18.13'
+ VERSION='2.18.14'
cat >>confdefs.h <<_ACEOF
@@ -2510,7 +2510,7 @@
-VERSION="2.18.13"
+VERSION="2.18.14"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
@@ -3451,7 +3451,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.18.13, which was
+This file was extended by yast2-network $as_me 2.18.14, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3501,7 +3501,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-network config.status 2.18.13
+yast2-network config.status 2.18.14
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/configure.in new/yast2-network-2.18.15/configure.in
--- old/yast2-network-2.18.13/configure.in 2009-03-02 09:21:50.000000000 +0100
+++ new/yast2-network-2.18.15/configure.in 2009-03-03 14:45:35.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.18.13, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.18.14, 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.18.13"
+VERSION="2.18.14"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/src/config/networking.rnc new/yast2-network-2.18.15/src/config/networking.rnc
--- old/yast2-network-2.18.13/src/config/networking.rnc 2008-12-03 10:59:07.000000000 +0100
+++ new/yast2-network-2.18.15/src/config/networking.rnc 2009-03-03 09:41:33.000000000 +0100
@@ -44,6 +44,7 @@
# address
ipaddr? &
+ prefixlen? &
remote_ipaddr? &
element netmask { text }? & #overloaded
element bonding_master { text }? &
@@ -106,6 +107,7 @@
broadcast = element broadcast { text }
dhclient_set_down_link = element dhclient_set_down_link { text }
ipaddr = element ipaddr { text }
+prefixlen = element prefixlen { text }
usercontrol = element usercontrol { text }
mtu = element mtu { text }
ethtool_options = element ethtool_options { text }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/src/lan/complex.ycp new/yast2-network-2.18.15/src/lan/complex.ycp
--- old/yast2-network-2.18.13/src/lan/complex.ycp 2009-02-16 13:12:59.000000000 +0100
+++ new/yast2-network-2.18.15/src/lan/complex.ycp 2009-03-03 14:15:14.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Summary, overview and IO dialogs for network cards config
* Authors: Michal Svec
*
- * $Id: complex.ycp 55530 2009-02-16 12:12:59Z mzugec $
+ * $Id: complex.ycp 55882 2009-03-03 13:15:14Z mzugec $
*/
{
@@ -116,18 +116,6 @@
LanItems::Items[LanItems::current, "ifcfg"] = LanItems::getCurrentItem()["hwinfo", "dev_name"]:"";
LanItems::Items[LanItems::current, "commited"] = false;
LanItems::operation = `edit;
-// LanItems::SetDefaultsForHW ();
-
-/*
- if (NetworkModules::Alias == "")
- {
- if (!Popup::ContinueCancel (_("The device does not have a driver module.
-The driver may be built in the kernel.")))
- {
- return false;
- }
- }
-*/
string fw = "";
if (LanItems::needFirmwareCurrentItem()){
fw = LanItems::GetFirmwareForCurrentItem();
@@ -160,9 +148,6 @@
if (fw=="b43-fwcutter"){
if(Popup::ContinueCancelHeadline(_("Installing firmware"), _("For successful firmware installation the, 'install_bcm43xx_firmware' script needs to be executed. Execute it now ?"))){
map command = (map)SCR::Execute(.target.bash_output, "/usr/sbin/install_bcm43xx_firmware");
- //y2internal("command %1", command);
-// Popup::ShowFile ("Boot Messages", "/tmp/bcm_firmware.log");
-// Popup::LongText(command["stdout"]:"");
if (command["exit"]:-1!=0)
Popup::ErrorDetails(_("An error occurred during firmware installation."), command["stderr"]:"");
else
@@ -233,10 +218,6 @@
UI::ChangeWidget (`id (b), `Enabled, false);
});
}
-/*
- if (hasAnyValue(LanItems::getCurrentItem()["hwinfo", "dev_name"]:"") && size(LanItems::getCurrentItem()["hwinfo"]:$[])>0) UI::ChangeWidget(`id(`edit), `Enabled, true);
- else UI::ChangeWidget(`id(`edit), `Enabled, false);
-*/
}
boolean shown = false;
@@ -286,12 +267,6 @@
else // configured
{
LanItems::SetItem();
-/*
- foreach(map row, o_items, {
- if (row["id"]:-1 == LanItems::current && row["hw_num"]:-1 != -1) LanItems::SelectHW(row["hw_num"]:-1);
- });
-*/
-// Lan::SelectHW (1);
if (LanItems::startmode == "managed")
{
// Continue-Cancel popup
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/src/lan/help.ycp new/yast2-network-2.18.15/src/lan/help.ycp
--- old/yast2-network-2.18.13/src/lan/help.ycp 2009-01-13 08:58:37.000000000 +0100
+++ new/yast2-network-2.18.15/src/lan/help.ycp 2009-03-03 14:45:20.000000000 +0100
@@ -78,7 +78,7 @@
the device through which the traffic to the defined network will be routed, as well.\"-\" is an alias for any interface.</p>
") +
/* Routing dialog help 2/2 */
-_("<p>Enable <b>IP Forwarding</b> if the system is a router.</p>"),
+_("<p>Enable <b>IP Forwarding</b> if the system is a router. This will apply on both IPv4 and IPv6.</p>"),
"dhcp_hostname":
_("<p>If you are using DHCP to get an IP address, check whether you get
@@ -232,16 +232,21 @@
"),
"additional":
- /* Aliases dialog help 1/3 */
+ /* Aliases dialog help 1/4 */
_("<p><b><big>Additional Addresses</big></b></p>
<p>Configure additional addresses of an interface (its aliases) in this table.</p>
") +
- /* Aliases dialog help 2/3 */
+ /* Aliases dialog help 2/4 */
_("<p>Enter an <b>Alias Name</b>, an <b>IP Address</b>, and
the <b>Netmask</b>.</p>") +
- /* Aliases dialog help 3/3, #83766 */
+ /* Aliases dialog help 3/4 */
+ _("<p><b>Alias Name</b> is optional and legacy.The total
+ length of interface name (inclusive of the colon and label) is
+ limited to 15 characters and the obsolete ifconfig utility truncates it after 9 characters.</p>")+
+
+ /* Aliases dialog help 3/4, #83766 */
_("<p>Do not include the interface name in the alias name. For example, enter <b>foo</b> instead of <b>eth0:foo</b>.</p>"),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/src/modules/LanItems.ycp new/yast2-network-2.18.15/src/modules/LanItems.ycp
--- old/yast2-network-2.18.13/src/modules/LanItems.ycp 2009-02-24 17:10:27.000000000 +0100
+++ new/yast2-network-2.18.15/src/modules/LanItems.ycp 2009-03-02 14:50:33.000000000 +0100
@@ -236,7 +236,6 @@
if (size(Items[key, "udev", "net"]:[])>0) {
string dev_name = Items[key, "hwinfo", "dev_name"]:"";
current=key;
-// net_rules = add(net_rules, sformat("SUBSYSTEM==\"net\", DRIVERS==\"?*\", %1, NAME=\"%2\"", GetItemUdev("ATTR{address}"), GetItemUdev("NAME")));
net_rules = add(net_rules, mergestring(Items[key, "udev", "net"]:[], ", "));
if (dev_name!=GetItemUdev("NAME")) {
changed_devices = add(changed_devices, dev_name);
@@ -503,19 +502,6 @@
}
}
- // build the "Bond Slaves" entry of rich box
- if (type == "bond")
- {
-/*
- string slaves = "";
- foreach (string key, any value, (map)v, {
- if ((value != nil) && (regexpmatch(key, "BONDING_SLAVE[0-9]")))
- slaves = slaves + ((slaves != "") ? ", " : "") + (string)value;
- });
- if (slaves != "")
- bullets = bullets + [_("Bond slaves")+ " : " + slaves];
-*/
- }
if (type == "wlan" &&
!(NetworkInterfaces::Current["WIRELESS_AUTH_MODE"]:"" != "open") &&
!hasAnyValue(NetworkInterfaces::Current["WIRELESS_KEY_0"]:""))
@@ -645,14 +631,6 @@
// FIXME: devname
hotplug = "";
- if(hotplug == "") {
- // FIXME: MOD Module["module"] = hw["module"]:"";
- // FIXME: MOD Module["options"] = hw["options"]:"";
-// NetworkModules::Alias = hardware["module"]:"";
-// NetworkModules::Options = hardware["options"]:"";
- }
- else
- y2milestone("HOTPLUG(%1) -> ignoring modprobe.conf", hotplug);
// Wireless Card Features
wl_auth_modes = prepend(hardware["wl_auth_modes"]:nilliststring, "no-encryption");
@@ -956,91 +934,34 @@
}
type = Items[current, "hwinfo", "type"]:"eth";
-// type = "eth0";
device = NetworkInterfaces::GetFreeDevice(type);
- // FIXME: MOD AddModule(type);
-// NetworkModules::AddM();
-// nm_name = NetworkModules::GetFreeName("static-");
// TODO: instead of udev use hwinfo dev_name
NetworkInterfaces::Name = GetItemUdev("NAME");
if (size(Items) Edit */
-/* FIXME: NI:
- else {
- if(!CheckDevice(dev)) {
- y2error("Device not found: %1", dev);
- return false;
- }
- NetworkInterfaces::Edit(dev);
- devmap = NetworkInterfaces::Current;
- type = NetworkInterfaces::device_type(dev);
- device = NetworkInterfaces::device_num(dev);
- alias = NetworkInterfaces::alias_num(dev);
- }
-*/
/* general stuff */
description = BuildDescription (type, device, devmap, Hardware);
SetDeviceVars(devmap, SysconfigDefaults);
hotplug = "";
- /*
- if(issubstring(device, "bus-pcmcia"))
- hotplug = "pcmcia";
- else if(issubstring(device, "bus-usb"))
- hotplug = "usb";
- */
y2debug("type=%1", type);
if(issubstring(type, "-")) type = regexpsub(type, "([^-]+)-.*$", "\\1");
y2debug("type=%1", type);
- /* kernel options */
-// if(hotplug == "" && alias == "" && nm_name != "") {
- // FIXME: MOD SelectModule(dev);
-// NetworkModules::SelectM(nm_name);
-// }
-// else {
- // FIXME: MOD SelectModule("");
-// NetworkModules::AddM();
-// }
-
-// qeth_options = NetworkModules::QETH_OPTIONS;
-// chan_mode = NetworkModules::CCW_CHAN_MODE;
-// lcs_timeout = NetworkModules::LCS_LANCMD_TIMEOUT;
-
-/*
- if (NetworkModules::QETH_IPA_TAKEOVER == nil ||
- NetworkModules::QETH_IPA_TAKEOVER == "" ||
- NetworkModules::QETH_IPA_TAKEOVER == "0")
- ipa_takeover = false;
- else
- ipa_takeover = true;
-
- if (NetworkModules::QETH_LAYER2_SUPPORT == nil ||
- NetworkModules::QETH_LAYER2_SUPPORT == "" ||
- NetworkModules::QETH_LAYER2_SUPPORT == "0")
- qeth_layer2 = false;
- else
- qeth_layer2 = true;
-*/
/* 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";
}
- //if(bootproto == "none") bootproto = "static";
-
return true;
}
@@ -1086,77 +1007,6 @@
}
newdev["NAME"] = description;
if (!issubstring(Items[current, "ifcfg"]:"", type)) newdev["INTERFACETYPE"]=type;
-// if(unique != "" && unique != nil) newdev["udi"] = unique;
-/*
- if(hotplug == "") {
- if(alias == "") {
- // FIXME: MOD ChangeModule(NetworkInterfaces::device_name(type, device), operation == `add);
- y2milestone("HWCFG name %1 (%2)", nm_name, nm_name_old);
- if(hasAnyValue(nm_name) && operation == `edit &&
- hasAnyValue(nm_name_old) && nm_name != nm_name_old) {
- y2milestone("HWCFG name change (%1) -> deleting old (%2)", nm_name, nm_name_old);
- NetworkModules::DeleteM(nm_name_old);
- nm_name_old = nil;
- }
-
- if(Arch::s390 ()) {
- string type2 = DriverType (type);
- if(type2 == "iucv") {
- NetworkModules::SCRIPTUP = "hwup-iucv";
- }
- else {
- NetworkModules::SCRIPTUP = "hwup-ccw";
- NetworkModules::SCRIPTUP_ccw = "hwup-ccw";
- NetworkModules::SCRIPTDOWN = "hwdown-ccw";
- NetworkModules::SCRIPTUP_ccwgroup = "hwup-" + type2;
- }
-
- integer devid = 0;
- string devstr = "";
-
- y2milestone("nm_name=%1", nm_name);
- string s390chanid = "[0-9]+\\.[0-9]+\\.";
- if(regexpmatch(nm_name, s390chanid)) {
- devid = tointeger("0x" + regexpsub(nm_name, s390chanid + "(.*)", "\\1"));
- devstr = regexpsub(nm_name, ".*[^0-9](" + s390chanid + ").*", "\\1");
- }
-
- y2milestone("devid=%1(%2)", devid, devstr);
- if(devid == nil) devid = 0;
- string devid0 = String::PadZeros(regexpsub(tohexstring(devid), "0x(.*)", "\\1"), 4);
- string devid1 = String::PadZeros(regexpsub(tohexstring(devid+1), "0x(.*)", "\\1"), 4);
- string devid2 = String::PadZeros(regexpsub(tohexstring(devid+2), "0x(.*)", "\\1"), 4);
-
- if(type2 == "ctc" || type2 == "lcs") {
- NetworkModules::CCW_CHAN_IDS = sformat("%1%2 %1%3", devstr, devid0, devid1);
- NetworkModules::CCW_CHAN_MODE = chan_mode;
- NetworkModules::CCW_CHAN_NUM = "2";
- NetworkModules::LCS_LANCMD_TIMEOUT = lcs_timeout;
- }
- else if(type2 == "qeth") {
- NetworkModules::CCW_CHAN_IDS = sformat("%1%2 %1%3 %1%4", devstr, devid0, devid1, devid2);
- NetworkModules::CCW_CHAN_MODE = chan_mode;
- NetworkModules::CCW_CHAN_NUM = "3";
- NetworkModules::QETH_OPTIONS = qeth_options;
- NetworkModules::QETH_IPA_TAKEOVER = ipa_takeover? "1": "0";
- NetworkModules::QETH_LAYER2_SUPPORT = qeth_layer2? "1": "0";
- if (qeth_layer2 && qeth_macaddress != "00:00:00:00:00:00") {
- newdev["LLADDR"] = qeth_macaddress;
- }
- else {
- // #151196: layer 3 otherwise fails
- newdev["LLADDR"] = "";
- }
- }
-
- }
-
- // If "", no hwcfg is created. See also #42421.
- if (NetworkModules::ChangeM(nm_name)) Items[current, "hwcfg"]=nm_name;
- else Items[current, "hwcfg"]="";
- }
- }
-*/
if(hotplug == "pcmcia") newdev["DHCLIENT_SET_DOWN_LINK"] = "yes";
@@ -1230,18 +1080,10 @@
newdev["WIRELESS_POWER"] = wl_power ? "yes" : "no";
}
-// if(hasAnyValue(nm_name)) newdev["_nm_name"] = nm_name;
-
if(DriverType (type) == "ctc")
if(NetworkConfig::Config["WAIT_FOR_INTERFACES"]:nil == nil || NetworkConfig::Config["WAIT_FOR_INTERFACES"]:0 < 40)
NetworkConfig::Config["WAIT_FOR_INTERFACES"] = 40;
- /* FIXME: MOD
- if(DriverType (type) == "qeth")
- if(NetworkConfig::Config["WAIT_FOR_INTERFACES"]:nil == nil || NetworkConfig::Config["WAIT_FOR_INTERFACES"]:0 < 15)
- NetworkConfig::Config["WAIT_FOR_INTERFACES"] = 15;
- */
-
if(alias == "") {
newdev["_aliases"] = aliases;
y2milestone("aliases %1", aliases);
@@ -1264,7 +1106,6 @@
y2error("Unknown operation: %1", operation);
return false;
}
-// nm_name_old = nil;
modified = true;
operation = nil;
return true;
@@ -1404,30 +1245,6 @@
} else {
// this is the first interface, match the hardware with install.inf
-/*
- // couldn't happen
- if (size(InstallInf)>0){
- // Select the one from install.inf with the same MAC
- // find H["mac"] == InstallInf["hwaddr"]
- if (tosel == nil ) {
- string hwaddr = InstallInf["hwaddr"]:"";
- if(hwaddr != nil && hwaddr != "") {
- tosel = find (map h, Hardware, ``( h["mac"]:"" == hwaddr ));
- }
- y2milestone("Rule: matching hwaddr in install.inf");
- }
-
- // Select the one from install.inf with the same module
- // find H["module"] == InstallInf["module"]
- if (tosel == nil) {
- string infmodule = InstallInf["module"]:"";
- if(infmodule != nil && infmodule != "") {
- tosel = find (map h, Hardware, ``( h["module"]:"" == infmodule ));
- }
- y2milestone("Rule: matching module in install.inf");
- }
- } else
-*/
{
/* No install.inf -> select the first connected */
// find H["active"] == true
@@ -1496,9 +1313,6 @@
if (!hasAnyValue(type)) type = NetworkInterfaces::GetType(getCurrentItem()["ifcfg"]:"");
device = getCurrentItem()["ifcfg"]:"";
alias = NetworkInterfaces::alias_num(getCurrentItem()["ifcfg"]:"");
-// nm_name = Items[current, "hwcfg"]:"";
-// if (nm_name=="") nm_name_old = createHwcfgName(Items[current, "hwinfo"]:$[], type);
-// NetworkModules::SelectM(nm_name);
/* general stuff */
description = BuildDescription (type, device, devmap, Hardware);
@@ -1512,35 +1326,6 @@
if(issubstring(type, "-")) type = regexpsub(type, "([^-]+)-.*$", "\\1");
y2debug("type=%1", type);
- /* kernel options */
- if(hotplug == "" && alias == "" && nm_name != "") {
- // FIXME: MOD SelectModule(dev);
-// NetworkModules::SelectM(nm_name);
- }
- else {
- // FIXME: MOD SelectModule("");
-// NetworkModules::AddM();
- }
-
-/*
- qeth_options = NetworkModules::QETH_OPTIONS;
- chan_mode = NetworkModules::CCW_CHAN_MODE;
- lcs_timeout = NetworkModules::LCS_LANCMD_TIMEOUT;
-
- if (NetworkModules::QETH_IPA_TAKEOVER == nil ||
- NetworkModules::QETH_IPA_TAKEOVER == "" ||
- NetworkModules::QETH_IPA_TAKEOVER == "0")
- ipa_takeover = false;
- else
- ipa_takeover = true;
-
- if (NetworkModules::QETH_LAYER2_SUPPORT == nil ||
- NetworkModules::QETH_LAYER2_SUPPORT == "" ||
- NetworkModules::QETH_LAYER2_SUPPORT == "0")
- qeth_layer2 = false;
- else
- qeth_layer2 = true;
-*/
/* 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";
@@ -1564,7 +1349,6 @@
}
NetworkInterfaces::Add();
operation = `edit;
-// interfacename=getCurrentItem()["hwinfo", "dev_name"]:"";
Items[current, "ifcfg"]=getCurrentItem()["hwinfo", "dev_name"]:"";
description = HardwareName([getCurrentItem()["hwinfo"]:$[]], getCurrentItem()["hwinfo", "dev_name"]:"");
Commit ();
@@ -1596,13 +1380,6 @@
case "qeth":
case "hsi":
string portnumber_param = (size(qeth_portnumber)>0) ? sformat("-n %1", qeth_portnumber) : "";
-/*
- if (size(chan_mode)>0)
- // chan_ids (read, write, control), port
- command1=sformat("qeth_configure %1 -p %2 %3 %4 1", qeth_layer2?"-l":"", chan_mode, portnumber_param, qeth_chanids);
- else
- command1=sformat("qeth_configure %1 %2 %3 1", qeth_layer2?"-l":"", portnumber_param, qeth_chanids);
-*/
string portname_param=(size(chan_mode)>0) ? sformat("-p %1", chan_mode) : "";
string options_param=(size(qeth_options)>0) ? sformat("-o %1", qeth_options) : "";
command1=sformat("qeth_configure %1 %2 %3 %4 %5 1", options_param, qeth_layer2?"-l":"", portname_param, portnumber_param, qeth_chanids);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/src/modules/Lan.ycp new/yast2-network-2.18.15/src/modules/Lan.ycp
--- old/yast2-network-2.18.13/src/modules/Lan.ycp 2009-02-23 12:09:45.000000000 +0100
+++ new/yast2-network-2.18.15/src/modules/Lan.ycp 2009-03-02 14:58:44.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec
*
- * $Id: Lan.ycp 55669 2009-02-23 11:09:44Z mzugec $
+ * $Id: Lan.ycp 55847 2009-03-02 13:58:43Z mzugec $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -86,28 +86,6 @@
global block<boolean> AbortFunction = nil;
-
-/*--------------*/
-/* PRIVATE DATA */
-
-
-
-/**
- * Modules information
- * @see ReadModules
- */
-// FIXME: MOD map Modules = $[];
-
-/**
- * Deleted modules
- */
-// FIXME: MOD list<string> DeletedModules = [];
-
-
-// FIXME: used in lan/address.ycp (#17346) -> "global"
-
-
-
/*------------------*/
/* GLOBAL FUNCTIONS */
@@ -137,7 +115,6 @@
map configurations = NetworkInterfaces::FilterDevices("netcard");
foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), {
foreach(string devname, (list<string>) Map::Keys(configurations[devtype]:$[]), {
-// string confname = NetworkInterfaces::device_name(devtype, devnum);
string mac = ((map)SCR::Execute(.target.bash_output, sformat("cat /sys/class/net/%1/address|tr -d '\n'", devname)))["stdout"]:"";
y2milestone("confname %1", mac);
if (!haskey(link_status, mac)) y2error("Mac address %1 not found in map %2!", mac, link_status);
@@ -151,14 +128,6 @@
}
-
-
-//include "network/hardware.ycp";
-//include "network/install.ycp";
-//include "network/routines.ycp";
-//include "network/runtime.ycp";
-
-
/**
* Lan::Read (`cache) will do nothing if initialized already.
*/
@@ -334,7 +303,6 @@
global define boolean Write() {
y2milestone("Writing configuration");
-// if(!write_only && NetHwDetection::running) NetHwDetection::Stop();
/* Stop the detection */
if(!LanItems::modified) {
@@ -439,7 +407,6 @@
if(Abort()) return false;
/* Progress step 9 */
ProgressNextStage(_("Activating network services..."));
-// NetworkModules::HwUp ();
// during installation export sysconfig settings into NetworkManager (bnc#433084)
if (Mode::installation() && NetworkService::IsManaged()) y2internal("Export sysconfig settings into NetworkManager %1", SCR::Execute(.target.bash_output, "/usr/lib/NetworkManager/nm-opensuse-sysconfig-merge --connections"));
@@ -485,7 +452,6 @@
else if(Service::Status("network")==0){
Service::Reload("network");
} else Service::Restart("network");
-// NetworkService::StartStop ();
sleep(sl);
}
@@ -691,10 +657,8 @@
* @return true if success
*/
global define boolean Add() {
-// LanItems::operation = nil;
if(LanItems::Select("") != true) return false;
NetworkInterfaces::Add();
-// LanItems::AddNew();
return true;
}
@@ -893,144 +857,6 @@
-// Add();
-
-// map tosel = nil;
-
- /* Some HW found -> use it for proposal */
-// if(size(LanItems::Hardware) > 0) {
-// if (Arch::s390()){
-// tosel = FindMatchingDevice( $["device":sformat("%1-id-%2",InstallInf["module"]:"", InstallInf["hwaddr"]:"")] );
-// }
-// else
-// tosel = LanItems::FindMatchingDevice($[]);
-
-// }
-
-
-// y2debug("Hardware=%1", LanItems::Hardware);
-// y2milestone ("Selected HW w/o install.inf patches: %1", tosel);
-
-/*
- // do not select a card without a driver, #29296
- if (tosel != nil)
- {
- // L3 N#81533
- // Autoyast takes network config from install.inf, has
- // problem with hardware that has a choice of drivers:
- // Module A is used even though install.inf says module B.
- // It is because we selected the _hardware_ and then took
- // the first module.
- // Future: select hardware+driver together
- // CODE 9 fix: for the selected hardware, patch in the driver
-
- // We cannot simply _create_ tosel from install.inf data because
- // SelectHW relies on the detected info (eg. busid) from hwinfo
- // which is not in install.inf
-
-
- if (InstallInf["module"]:"" != "")
- {
- y2milestone ("Using driver module from install.inf");
- tosel["module"] = InstallInf["module"]:"";
- }
- // L3 bug: 75720
- // Setup module options available from /etc/install.inf
- string _options = InstallModuleOptions(tosel["module"]:"");
- if (_options != "" && _options!=nil) {
- y2milestone ("Using driver options from install.inf");
- tosel["options"] = _options;
- }
-
- y2milestone ("Selected HW with install.inf patches: %1", tosel);
- SelectHWMap(tosel);
- // set layer2 status from /etc/install.inf
- qeth_layer2 = (InstallInf["QETH_LAYER2_SUPPORT"]:"0"=="1")?true:false;
- qeth_macaddress = InstallInf["LLADDR"]:"";
- }
- // Nothing detected -> use InstallInf
-
- else if(size(InstallInf) > 0) {
-
- if(!haskey(InstallInf, "module")) {
- y2milestone("No hardware, no install.inf module -> no proposal.");
- return false;
- }
-
- // FIXME: MOD Module["module"] = InstallInf["module"]:"";
- // FIXME: MOD Module["options"] = InstallInf["options"]:"";
-
- NetworkModules::Alias = InstallInf["module"]:"";
- NetworkModules::Options = InstallInf["options"]:"";
-
-
- type = InstallInf["type"]:"eth";
- device = NetworkInterfaces::GetFreeDevice(type);
- }
-
- else {
- y2milestone("No hardware, no install.inf -> no proposal.");
- return false;
- }
-*/
-
-// here we know the hardware and could fill the interface defaults for it,
-// like for wifi usercontrol and for eth|wifi ifplugd.
-// This is proposal. also need to do it with
-// - add from ui: detected and undetected
-// - autoyast
-// LanItems::SetDefaultsForHW ();
-
- // #145041
-// ethtool_options = InstallInf["ethtool_options"]:"";
-
- // #176804
-/*
- if (NetworkStorage::isDiskOnNetwork ( NetworkStorage::getDevice("/") ))
- {
- LanItems::startmode = "nfsroot";
- y2milestone ("startmode nfsroot");
- }
-*/
-// ipaddr = InstallInf["ipaddr"]:"";
-// bootproto = InstallInf["bootproto"]:"static";
-// y2debug("ipaddr,bootproto=%1,%2", LanItems::ipaddr, LanItems::bootproto);
-// if(LanItems::bootproto == "static" && LanItems::ipaddr != "" && LanItems::ipaddr != nil) {
-
-// y2milestone("static proposal");
-
- /* propose address setup from /etc/install.inf */
-// netmask = InstallInf["netmask"]:"";
-// if(LanItems::netmask == nil || LanItems::netmask == "")
-// LanItems::netmask = "255.255.255.0";
-// }
-// else {
- /* Propose static config in case of DSL hardware is found */
-// list pppoe = (list) SCR::Read(.probe.pppoe);
- // FIXME: testing pppoe = [ $["a" : "b"] ];
-// map pppoedev = pppoe[0]:$[];
-// y2milestone ("pppoe=%1", pppoe);
-// if(pppoe != nil && size(pppoe) > 0) {
-// y2milestone("DSL proposal");
-// LanItems::ipaddr = "";
-// LanItems::bootproto = "static";
-// }
-// else {
- // Open Enterprise Server does not like DHCP (#50524).
- // In that case, we cannot propose.
-// if (ProductFeatures::GetBooleanFeature ("network", "force_static_ip"))
-// {
-// y2milestone ("Static config forced but no info available -> no proposal.");
-// return false;
-// }
-// y2milestone("DHCP proposal");
-// LanItems::ipaddr = "";
-// LanItems::bootproto = "dhcp";
-// }
-// }
-
-// LanItems::Commit();
-
y2milestone("NetworkConfig::Config=%1", NetworkConfig::Config);
y2milestone("NetworkConfig::DHCP=%1", NetworkConfig::DHCP);
@@ -1049,31 +875,7 @@
return false;
}
-/*
- y2milestone ("hostname from install.inf");
- if (! DNS::ReadHostDomain (InstallInf["hostname"]:"",
- InstallInf["domain"]:""))
- {
- y2milestone ("hostname from dns");
- // try to get hostname from the network
- string hnent = NetHwDetection::ResolveIP(ipaddr);
-
- //last resort - generate random hostname (#165269)
- if (hnent == "")
- {
- y2milestone("random hostname");
- srandom ();
- DNS::ReadHostDomain("linux-" + String::Random(4), "site");
- }
- else
- {
- list hnsplit = Hostname::SplitFQ(hnent);
- DNS::ReadHostDomain (hnsplit[0]:"", hnsplit[1]:"");
- }
-
- }
-*/
- return true;
+ return true;
}
/**
@@ -1082,11 +884,6 @@
*/
global define boolean ProposeRoutesAndResolver () {
if(LanItems::bootproto == "static" && LanItems::ipaddr != "" && LanItems::ipaddr != nil) {
- /* propose default gateway from /etc/install.inf */
-// Routing::ReadFromGateway (InstallInf["gateway"]:"");
-
- /* propose DNS setup from /etc/install.inf */
-// DNS::ReadNameserver (InstallInf["nameserver"]:"");
ProposeHostname ();
}
return true;
@@ -1097,8 +894,8 @@
* @return true if something was proposed
*/
global define boolean Propose() {
-NetworkInterfaces::CleanCacheRead();
-LanItems::Read();
+ NetworkInterfaces::CleanCacheRead();
+ LanItems::Read();
return
ProposeInterfaces () &&
ProposeRoutesAndResolver ();
@@ -1140,24 +937,9 @@
aymodule["module"]:"" : tosel["module"]:"";
tosel["options"] = (aymodule["options"]:""!= "")?
aymodule["options"]:"" : tosel["options"]:"";
-
- LanItems::SelectHWMap(tosel);
- }
- /* Nothing detected -> use InstallInf */
-/*
- else if(size(InstallInf) > 0) {
- if(!haskey(InstallInf, "module")) {
- y2milestone("No hardware, no install.inf module -> no proposal.");
- return false;
- }
- NetworkModules::Alias = InstallInf["module"]:"";
- NetworkModules::Options = InstallInf["options"]:"";
-
-// type = InstallInf["type"]:"eth";
- device = NetworkInterfaces::GetFreeDevice(type);
+ LanItems::SelectHWMap(tosel);
}
-*/
else {
y2milestone("No hardware, no install.inf -> no autoinstallation possible.");
return false;
@@ -1179,14 +961,14 @@
LanItems::SetDeviceVars(interface, defaults);
y2debug("ipaddr,bootproto=%1,%2", LanItems::ipaddr, LanItems::bootproto);
- if(LanItems::bootproto == "static" && LanItems::ipaddr != "" && LanItems::ipaddr != nil)
+ if(LanItems::bootproto == "static" && LanItems::ipaddr != "" && LanItems::ipaddr != nil)
{
y2milestone("static configuration");
if(LanItems::netmask == nil || LanItems::netmask == "")
LanItems::netmask = "255.255.255.0";
-
+
}
LanItems::Commit();
});
@@ -1251,13 +1033,6 @@
*/
global list<string> Packages () {
list<string> pkgs = [];
- // #299033 - don't install smpppd now, do it later (with some tests)
-/*
- if (NetworkInterfaces::Locate ("USERCONTROL", "yes") != [])
- {
- if (!PackageSystem::Installed("smpppd")) pkgs = add (pkgs, "smpppd");
- }
-*/
map required = $[
"types":$[
"wlan" : "wireless-tools",
@@ -1318,13 +1093,6 @@
global define boolean HaveXenBridge () {
// changed xen bridge detection (bnc#375606)
boolean have_br = FileUtils::Exists("/dev/shm/sysconfig/xenbridges");
- // #2248874 - disallow error message
-/*
- if (PackageSystem::Installed("bridge-utils")){
- string cmd = "brctl show | grep '^xenbr'";
- have_br = SCR::Execute (.target.bash, cmd) == 0;
- }
-*/
y2milestone ("Have Xen bridge: %1", have_br);
return have_br;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/src/modules/Routing.ycp new/yast2-network-2.18.15/src/modules/Routing.ycp
--- old/yast2-network-2.18.13/src/modules/Routing.ycp 2009-01-13 08:58:37.000000000 +0100
+++ new/yast2-network-2.18.15/src/modules/Routing.ycp 2009-03-03 14:48:47.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Routing data (/etc/sysconfig/network/routes)
* Authors: Michal Svec
*
- * $Id: Routing.ycp 54553 2009-01-12 15:42:35Z kmachalkova $
+ * $Id: Routing.ycp 55885 2009-03-03 13:48:46Z mzugec $
*
* See routes(5)
* Does not work with interface-specific routes yet (ifroute-lo...)
@@ -156,11 +156,15 @@
if(Forward) {
SCR::Write(.sysconfig.sysctl.IP_FORWARD, "yes");
+ SCR::Write(.sysconfig.sysctl.IPV6_FORWARD, "yes");
SCR::Execute(.target.bash, "echo 1 > /proc/sys/net/ipv4/ip_forward");
+ SCR::Execute(.target.bash, "echo 1 > /proc/sys/net/ipv6/conf/all/forwarding");
}
else {
SCR::Write(.sysconfig.sysctl.IP_FORWARD, "no");
+ SCR::Write(.sysconfig.sysctl.IPV6_FORWARD, "no");
SCR::Execute(.target.bash, "echo 0 > /proc/sys/net/ipv4/ip_forward");
+ SCR::Execute(.target.bash, "echo 0 > /proc/sys/net/ipv6/conf/all/forwarding");
}
sleep(sl);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/src/routines/summary.ycp new/yast2-network-2.18.15/src/routines/summary.ycp
--- old/yast2-network-2.18.13/src/routines/summary.ycp 2008-01-24 14:41:27.000000000 +0100
+++ new/yast2-network-2.18.15/src/routines/summary.ycp 2009-03-02 14:58:44.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Summary and overview functions
* Authors: Michal Svec
*
- * $Id: summary.ycp 43483 2008-01-08 17:49:13Z mzugec $
+ * $Id: summary.ycp 55847 2009-03-02 13:58:43Z mzugec $
*
* All config settings are stored in a global variable Devices.
* All hardware settings are stored in a global variable Hardware.
@@ -114,48 +114,6 @@
}
-/*
- list overviewdev = [
- `item(`id(0), "0", "ISDN", "ippp0", "Hisax ISDN"),
- ];
- list overviewif = [
- `item(`id(0), "0", "ippp", "Contactel", "1.2.3.4", "4.3.2.1"),
- `item(`id(1), "1", "ippp", "Czech Online", "1.2.3.6", "6.3.2.1"),
- ];
-
- y2debug("overviewdev=%1", overviewdev);
- y2debug("overviewif=%1", overviewif);
-
- import "Wizard";
- import "Label";
- Wizard::CreateDialog();
- term contents = nil;
-
- contents = OverviewTable(
- `header(_("No."), _("Type"), _("Device"), _("Hardware")),
- overviewdev
- );
-
- Wizard::SetContentsButtons("Network cards configuration overview", contents, "helptext",
- Label::BackButton(), Label::FinishButton());
-
- UI::UserInput();
-
- contents = OverviewTableDouble(
- "ISDN devices",
- `header(_("No."), _("Type"), _("Device"), _("Hardware")),
- overviewdev,
- "Providers",
- `header(_("No."), _("Type"), _("Connection"), _("IP"), _("Remote IP")),
- overviewif
- );
-
- Wizard::SetContentsButtons("ISDN configuration overview", contents, "helptext",
- Label::BackButton(), Label::FinishButton());
-
- UI::UserInput();
-
-*/
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/VERSION new/yast2-network-2.18.15/VERSION
--- old/yast2-network-2.18.13/VERSION 2009-03-02 09:19:17.000000000 +0100
+++ new/yast2-network-2.18.15/VERSION 2009-03-03 14:47:16.000000000 +0100
@@ -1 +1 @@
-2.18.13
+2.18.15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org