Hello community,
here is the log from the commit of package yast2-network
checked in at Sat Jul 21 18:13:22 CEST 2007.
--------
--- yast2-network/yast2-network.changes 2007-07-18 15:23:40.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-07-20 18:27:55.000000000 +0200
@@ -1,0 +2,9 @@
+Fri Jul 20 18:19:27 CEST 2007 - mzugec@suse.de
+
+- disable to configure card without kernel device
+- fixed interface proposal (#292401)
+- write ipv6 correctly (#288744)
+- improved firmware database
+- 2.15.50
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.15.49.tar.bz2
New:
----
yast2-network-2.15.50.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.u12298/_old 2007-07-21 18:13:07.000000000 +0200
+++ /var/tmp/diff_new_pack.u12298/_new 2007-07-21 18:13:07.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.15.49)
+# spec file for package yast2-network (Version 2.15.50)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-network
-Version: 2.15.49
+Version: 2.15.50
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.15.49.tar.bz2
+Source0: yast2-network-2.15.50.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -53,7 +53,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.15.49
+%setup -n yast2-network-2.15.50
%build
%{prefix}/bin/y2tool y2autoconf
@@ -110,6 +110,12 @@
/usr/share/YaST2/schema/autoyast/rnc/proxy.rnc
%changelog
+* Fri Jul 20 2007 - mzugec@suse.de
+- disable to configure card without kernel device
+- fixed interface proposal (#292401)
+- write ipv6 correctly (#288744)
+- improved firmware database
+- 2.15.50
* Wed Jul 18 2007 - mzugec@suse.cz
- disallow to configure card without kernel device
- copy udev rules for persistent names on installed system
++++++ yast2-network-2.15.49.tar.bz2 -> yast2-network-2.15.50.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.49/configure new/yast2-network-2.15.50/configure
--- old/yast2-network-2.15.49/configure 2007-07-18 14:49:25.000000000 +0200
+++ new/yast2-network-2.15.50/configure 2007-07-20 18:11:28.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-network 2.15.48.
+# Generated by GNU Autoconf 2.60 for yast2-network 2.15.49.
#
# 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.15.48'
-PACKAGE_STRING='yast2-network 2.15.48'
+PACKAGE_VERSION='2.15.49'
+PACKAGE_STRING='yast2-network 2.15.49'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,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.15.48 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.15.49 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-network 2.15.48:";;
+ short | recursive ) echo "Configuration of yast2-network 2.15.49:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.15.48
+yast2-network configure 2.15.49
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,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.15.48, which was
+It was created by yast2-network $as_me 2.15.49, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-network'
- VERSION='2.15.48'
+ VERSION='2.15.49'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.48"
+VERSION="2.15.49"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
@@ -3258,7 +3258,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.15.48, which was
+This file was extended by yast2-network $as_me 2.15.49, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3301,7 +3301,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-network config.status 2.15.48
+yast2-network config.status 2.15.49
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.49/configure.in new/yast2-network-2.15.50/configure.in
--- old/yast2-network-2.15.49/configure.in 2007-07-18 14:49:21.000000000 +0200
+++ new/yast2-network-2.15.50/configure.in 2007-07-20 18:11:23.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.15.48, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.15.49, http://bugs.opensuse.org/, yast2-network)
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.15.48"
+VERSION="2.15.49"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.49/src/lan/complex.ycp new/yast2-network-2.15.50/src/lan/complex.ycp
--- old/yast2-network-2.15.49/src/lan/complex.ycp 2007-07-17 07:38:21.000000000 +0200
+++ new/yast2-network-2.15.50/src/lan/complex.ycp 2007-07-20 18:24:34.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Summary, overview and IO dialogs for network cards config
* Authors: Michal Svec
*
- * $Id: complex.ycp 39452 2007-07-17 05:38:38Z mzugec $
+ * $Id: complex.ycp 39580 2007-07-20 16:24:47Z mzugec $
*/
{
@@ -116,20 +116,21 @@
//non-empty keys are firmware packages shipped by SUSE
map request_firmware = $[
"atmel_pci" : "atmel-firmware",
- "atmel_cs" : "atmel-firmware",
- "bcm43xx" : "",
+ "atmel_cs" : "atmel-firmware",
+ "at76_usb" : "atmel-firmware",
"ipw2100" : "ipw-firmware",
"ipw2200" : "ipw-firmware",
+ "ipw3945" : "ipw-firmware",
+ "iwlwifi" : "ipw-firmware",
+ "bcm43xx" : "",
"prism54" : "",
"spectrum_cs" : "",
"zd1201" : "",
"zd1211rw" : "",
"acx" : "",
- "at76_usb" : "atmel-firmware",
- "ipw3945" : "ipw-firmware",
"rt61pci" : "",
"rt73usb" : "",
- "rt73" : "",
+ "prism54usb":""
];
Lan::Add ();
@@ -183,12 +184,18 @@
}
-define void IPv6Init (string key) {
+define void initIPv6 (string key) {
UI::ChangeWidget (`id (`ipv6), `Value, Lan::ipv6 ? true : false);
}
-define void IPv6Store (string key, map event) {
- if ((boolean) UI::QueryWidget (`id (`ipv6), `Value))
+
+define symbol handleIPv6( string key, map event ) {
+ if (event["EventReason"]:""=="ValueChanged") Lan::SetIPv6((boolean)UI::QueryWidget (`id (`ipv6), `Value));
+ return nil;
+}
+
+define void storeIPv6 (string key, map event) {
+ if ((boolean) UI::QueryWidget (`id (`ipv6), `Value))
Lan::SetIPv6(true);
else
Lan::SetIPv6(false);
@@ -343,12 +350,13 @@
"widget": `custom,
"custom_widget" :
`Frame ( _("IPv6 Protocol Settings"),
- `Left(`CheckBox(`id(`ipv6), _("Enable IPv6")))
+ `Left(`CheckBox(`id(`ipv6), `opt(`notify), _("Enable IPv6")))
),
"opt": [],
"help": help["ipv6"]:"",
- "init": IPv6Init,
- "store": IPv6Store,
+ "init": initIPv6,
+ "handle": handleIPv6,
+ "store": storeIPv6,
],
"OVERVIEW" : $[
"widget" : `custom,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.49/src/modules/LanItems.ycp new/yast2-network-2.15.50/src/modules/LanItems.ycp
--- old/yast2-network-2.15.49/src/modules/LanItems.ycp 2007-07-18 14:38:03.000000000 +0200
+++ new/yast2-network-2.15.50/src/modules/LanItems.ycp 2007-07-20 17:46:42.000000000 +0200
@@ -6,6 +6,7 @@
import "NetworkDevices";
import "ProductFeatures";
import "NetworkConfig";
+import "NetworkStorage";
include "network/complex.ycp";
include "network/routines.ycp";
@@ -240,7 +241,9 @@
return descr;
}
-void BuildLanOverview() {
+global list BuildLanOverview() {
+ list<string> overview=[];
+ list<string> links=[];
map startmode_descrs = $[
// summary description of STARTMODE=auto
"auto": _("Started automatically at boot"),
@@ -264,10 +267,11 @@
if (hasAnyValue(Items[key, "ifcfg"]:"") ){
NetworkDevices::Select(Items[key, "ifcfg"]:"");
- type = NetworkDevices::device_type(NetworkDevices::Name);
+// type = NetworkDevices::device_type(NetworkDevices::Name);
+ type = Items[key, "hwinfo", "type"]:"";
string dev = NetworkDevices::device_name(type, NetworkDevices::Name);
ip = DeviceProtocol(NetworkDevices::Current);
-
+ string status = DeviceStatus(type, NetworkDevices::device_num(NetworkDevices::Name), NetworkDevices::Current);
string startmode_descr = startmode_descrs[NetworkDevices::Current["STARTMODE"]:""]:_("Started manually");
@@ -308,8 +312,26 @@
bullets = bullets + [_("Bond slaves")+ " : " + slaves];
*/
}
+y2internal("%1\n%2", type, NetworkDevices::Current);
+ if (type == "wlan" &&
+ !(NetworkDevices::Current["WIRELESS_AUTH_MODE"]:"" != "open") &&
+ !hasAnyValue(NetworkDevices::Current["WIRELESS_KEY_0"]:""))
+ {
+ // avoid colons
+ dev = mergestring (splitstring (dev, ":"), "/");
+ string href = "lan--wifi-encryption-" + dev;
+ // interface summary: WiFi without encryption
+ string warning = HTML::Colorize (_("Warning: no encryption is used."), "red");
+ status = status + " " + warning + " " +
+ // Hyperlink: Change the configuration of an interface
+ Hyperlink (href, _("Change."));
+ links = add (links, href);
+ }
+
+ overview = add(overview, Summary::Device(descr, status));
+ } else
+ overview = add(overview, Summary::Device(descr, Summary::NotConfigured()));
- }
string conn = HTML::Bold ( (Items[key, "hwinfo", "link"]:false == true)?"":_("(not connected)") );
string mac_dev="";
if (hasAnyValue(Items[key, "hwinfo", "mac"]:"")) mac_dev= HTML::Bold ("MAC : ") + Items[key, "hwinfo", "mac"]:"" + "<br>";
@@ -329,6 +351,7 @@
"table_descr": [descr, ip]
];
});
+ return [ Summary::DevicesList(overview), links ];
}
@@ -503,6 +526,7 @@
* must be in sync with @ref GetDefaultsForHW
*/
global define void SetDefaultsForHW () {
+y2internal("SetDefaultsForHW type %1", type);
if (type == "wlan")
{
usercontrol = true;
@@ -511,12 +535,13 @@
{
mtu = "1492";
}
-
+/*
if (!needHwcfg(hw)){
nm_name_old = nm_name;
nm_name = "";
}
y2milestone("hwcfg name %1", nm_name);
+*/
}
string GetDeviceVar (map primary, map fallback, string key) {
@@ -677,7 +702,7 @@
y2debug("dev=%1", dev);
map devmap = $[];
/* dev=="" -> Add */
- if(dev == "") {
+// if(dev == "") {
// defaults for a new device
devmap = $[
"STARTMODE": "auto", // #115448, #156388
@@ -696,12 +721,13 @@
devmap["STARTMODE"] = product_startmode;
}
- type = "eth";
+ type = LanItems::Items[LanItems::current, "hwinfo", "type"]:"eth";
+// type = "eth0";
device = NetworkDevices::GetFreeDevice(type);
// FIXME: MOD AddModule(type);
- NetworkModules::AddM();
- nm_name = NetworkModules::GetFreeName("static-");
+// NetworkModules::AddM();
+// nm_name = NetworkModules::GetFreeName("static-");
NetworkDevices::Name = GetItemUdev()[1]:"";
LanItems::Items[LanItems::current, "ifcfg"] = NetworkDevices::Name;
@@ -711,29 +737,21 @@
/* FIXME: alias: how to prefill new alias? */
alias = "";
- }
+// }
/* dev!="" -> Edit */
+/* FIXME: NI:
else {
- /* FIXME: NI:
if(!CheckDevice(dev)) {
y2error("Device not found: %1", dev);
return false;
}
- */
NetworkDevices::Edit(dev);
devmap = NetworkDevices::Current;
type = NetworkDevices::device_type(dev);
device = NetworkDevices::device_num(dev);
alias = NetworkDevices::alias_num(dev);
- nm_name = devmap["_nm_name"]:"";
-
- if (nm_name==""){
- nm_name="";
- NetworkModules::AddM();
- nm_name_old = NetworkModules::GetFreeName("static-");
- }
}
-
+*/
/* general stuff */
description = BuildDescription (type, device, devmap, Hardware);
@@ -834,7 +852,7 @@
}
// if(unique != "" && unique != nil) newdev["udi"] = unique;
-
+/*
if(hotplug == "") {
if(alias == "") {
// FIXME: MOD ChangeModule(NetworkDevices::device_name(type, device), operation == `add);
@@ -903,6 +921,7 @@
else Items[current, "hwcfg"]="";
}
}
+*/
if(hotplug == "pcmcia") newdev["DHCLIENT_SET_DOWN_LINK"] = "yes";
@@ -966,7 +985,7 @@
newdev["WIRELESS_POWER"] = wl_power ? "yes" : "no";
}
- if(hasAnyValue(nm_name)) newdev["_nm_name"] = nm_name;
+// 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)
@@ -982,15 +1001,10 @@
newdev["_aliases"] = aliases;
y2milestone("aliases %1", aliases);
}
-// NetworkDevices::Name = NetworkDevices::device_name(NetworkDevices::RealType(type, hotplug), device);
-// NetworkDevices::Name = interfacename;
-// }
-// else
-// NetworkDevices::Name = NetworkDevices::alias_name(NetworkDevices::RealType(type, hotplug), device, alias);
NetworkDevices::Name = interfacename;
NetworkDevices::Current = newdev;
- NetworkDevices::Commit();
+ if (NetworkDevices::Commit()) Items[current, "ifcfg"]=interfacename;
}
else {
y2error("Unknown operation: %1", operation);
@@ -1215,7 +1229,7 @@
interfacename = Items[current, "ifcfg"]:"";
NetworkDevices::Edit(Items[current, "ifcfg"]:"");
map devmap = NetworkDevices::Current;
- type = NetworkDevices::device_type(Items[current, "ifcfg"]:"");
+ type = Items[current, "hwinfo", "type"]:"";
device = NetworkDevices::device_num(Items[current, "ifcfg"]:"");
alias = NetworkDevices::alias_num(Items[current, "ifcfg"]:"");
nm_name = Items[current, "hwcfg"]:"";
@@ -1275,4 +1289,25 @@
current = size(Items)+1;
}
+global boolean ProposeItemConfiguration(){
+ y2milestone("Propose configuration for %1", getCurrentItem());
+ operation = nil;
+ if(Select("") != true) return false;
+ SetDefaultsForHW ();
+ ipaddr = "";
+ bootproto = "dhcp";
+ // #176804
+ if (NetworkStorage::isDiskOnNetwork ( NetworkStorage::getDevice("/") ))
+ {
+ startmode = "nfsroot";
+ y2milestone ("startmode nfsroot");
+ }
+ NetworkDevices::Add();
+ operation = `edit;
+ interfacename=getCurrentItem()["hwinfo", "dev_name"]:"";
+ Commit ();
+ y2milestone("After configuration propose %1", getCurrentItem());
+ return true;
+}
+
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.49/src/modules/Lan.ycp new/yast2-network-2.15.50/src/modules/Lan.ycp
--- old/yast2-network-2.15.49/src/modules/Lan.ycp 2007-07-02 16:53:54.000000000 +0200
+++ new/yast2-network-2.15.50/src/modules/Lan.ycp 2007-07-20 18:24:34.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec
*
- * $Id: Lan.ycp 39111 2007-07-02 14:53:49Z mzugec $
+ * $Id: Lan.ycp 39580 2007-07-20 16:24:47Z mzugec $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -292,18 +292,14 @@
global void SetIPv6(boolean status){
if(ipv6 != status) {
ipv6=status;
+ Popup::Warning(_("To apply this change reboot is needed."));
LanItems::SetModified();
}
}
void writeIPv6(){
- if (ipv6){
- SCR::Execute(.target.string, "#install ipv6 /bin/true", "/etc/modprobe.d/ipv6");
- SCR::Write(.sysconfig.windowmanager.KDE_USE_IPV6, "yes");
- } else {
- SCR::Execute(.target.string, "install ipv6 /bin/true", "/etc/modprobe.d/ipv6");
- SCR::Write(.sysconfig.windowmanager.KDE_USE_IPV6, "no");
- }
+ SCR::Write(.target.string, "/etc/modprobe.d/ipv6", sformat("%1install ipv6 /bin/true", ipv6?"#":""));
+ SCR::Write(.sysconfig.windowmanager.KDE_USE_IPV6, ipv6?"yes":"no");
}
@@ -517,7 +513,8 @@
boolean split = (mode == "split");
- list sum = BuildSummary("netcard", LanItems::Hardware, split, mode == "proposal");
+// list sum = BuildSummary("netcard", LanItems::Hardware, split, mode == "proposal");
+ list sum = LanItems::BuildLanOverview();
/* Testing improved summary */
if(mode == "summary")
@@ -609,7 +606,6 @@
LanItems::interfacename = NetworkDevices::Name;
return true;
}
-
/**
* Delete the given device
* @param name device to delete
@@ -656,6 +652,8 @@
boolean nm_installed = Package::Installed ("NetworkManager");
y2milestone ("NetworkManager wanted: %1, installed: %2", nm_default, nm_installed);
+// NETWORK MANAGER force disabled
+nm_default=false;
return nm_default && nm_installed;
}
@@ -666,17 +664,16 @@
*/
define void ProposeNMInterfaces () {
y2milestone ("Minimal ifcfgs for NM");
- foreach (map hwitem, LanItems::Hardware, {
- Add ();
-
- LanItems::SelectHWMap (hwitem);
- LanItems::SetDefaultsForHW ();
- LanItems::ipaddr = "";
- LanItems::bootproto = "dhcp";
- // will say "Device already present" for existing because of Add,
- // which is what we want
- LanItems::Commit ();
+ foreach (integer number, any lanitem, LanItems::Items, {
+ if (hasAnyValue(((map)lanitem)["hwinfo", "dev_name"]:"")) {
+ LanItems::current = number;
+ if (!LanItems::IsItemConfigured()){
+y2internal("not configured - will configure %1", LanItems::getCurrentItem());
+ LanItems::ProposeItemConfiguration();
+ }
+ }
});
+
}
/**
@@ -706,31 +703,51 @@
return true;
}
+
/* Something is already configured -> do nothing */
- list<string> devs = NetworkDevices::List("netcard");
- if(size(devs) > 0) {
- y2milestone("Something already configured: don't propose.");
- y2milestone("devs=%1", devs);
- return false;
- }
+ foreach (integer number, any lanitem, LanItems::Items, {
+// if (hasAnyValue(((map)lanitem)["hwinfo", "dev_name"]:"")) {
+ LanItems::current = number;
+ if (LanItems::IsItemConfigured()){
+ y2milestone("Something already configured: don't propose.");
+// y2milestone("devs=%1", devs);
+ return false;
+ }
+// }
+ });
+
+
+ foreach (integer number, any lanitem, LanItems::Items, {
+ if (hasAnyValue(((map)lanitem)["hwinfo", "dev_name"]:"")) {
+ LanItems::current = number;
+ if (!LanItems::IsItemConfigured()){
+y2internal("not configured - will configure");
+ LanItems::ProposeItemConfiguration();
+ break;
+ }
+ }
+ });
+
- Add();
- map tosel = nil;
+
+// Add();
+
+// map tosel = nil;
/* Some HW found -> use it for proposal */
- if(size(LanItems::Hardware) > 0) {
+// if(size(LanItems::Hardware) > 0) {
// if (Arch::s390()){
// tosel = FindMatchingDevice( $["device":sformat("%1-id-%2",InstallInf["module"]:"", InstallInf["hwaddr"]:"")] );
// }
// else
- tosel = LanItems::FindMatchingDevice($[]);
+// tosel = LanItems::FindMatchingDevice($[]);
- }
+// }
- y2debug("Hardware=%1", LanItems::Hardware);
- y2milestone ("Selected HW w/o install.inf patches: %1", tosel);
+// y2debug("Hardware=%1", LanItems::Hardware);
+// y2milestone ("Selected HW w/o install.inf patches: %1", tosel);
/*
// do not select a card without a driver, #29296
@@ -800,56 +817,57 @@
// This is proposal. also need to do it with
// - add from ui: detected and undetected
// - autoyast
- LanItems::SetDefaultsForHW ();
+// 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) {
+// y2debug("ipaddr,bootproto=%1,%2", LanItems::ipaddr, LanItems::bootproto);
+// if(LanItems::bootproto == "static" && LanItems::ipaddr != "" && LanItems::ipaddr != nil) {
- y2milestone("static proposal");
+// 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 {
+// 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);
+// 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 {
+// 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";
- }
- }
+// 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();
+// LanItems::Commit();
y2milestone("NetworkConfig::Config=%1", NetworkConfig::Config);
y2milestone("NetworkConfig::DHCP=%1", NetworkConfig::DHCP);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.49/src/routines/complex.ycp new/yast2-network-2.15.50/src/routines/complex.ycp
--- old/yast2-network-2.15.49/src/routines/complex.ycp 2007-07-18 15:18:56.000000000 +0200
+++ new/yast2-network-2.15.50/src/routines/complex.ycp 2007-07-20 18:24:34.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Summary and overview functions
* Authors: Michal Svec
*
- * $Id: complex.ycp 39501 2007-07-18 13:19:14Z mzugec $
+ * $Id: complex.ycp 39580 2007-07-20 16:24:47Z mzugec $
*
*/
@@ -184,7 +184,8 @@
*/
define list<any> BuildSummary(string devregex, list<map> Hardware, boolean split, boolean link) {
map Devs = NetworkDevices::FilterDevices (devregex);
- return BuildSummaryDevs (Devs, Hardware, split, link);
+ list <any> ret = BuildSummaryDevs (Devs, Hardware, split, link);
+ return ret;
}
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.49/src/routines/widgets.ycp new/yast2-network-2.15.50/src/routines/widgets.ycp
--- old/yast2-network-2.15.49/src/routines/widgets.ycp 2007-06-15 11:22:57.000000000 +0200
+++ new/yast2-network-2.15.50/src/routines/widgets.ycp 2007-07-20 18:25:35.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Widgets for CWM
* Authors: Martin Vidner
*
- * $Id: widgets.ycp 38482 2007-06-15 09:22:51Z mzugec $
+ * $Id: widgets.ycp 39561 2007-07-20 11:37:50Z kmachalkova $
*/
{
@@ -184,21 +184,12 @@
define string GetDeviceDescription(string device_id) {
- // get sysfs patch for device
- string sysfs = ((map)SCR::Execute(.target.bash_output, sformat("getcfg %1|grep '^HWD_DEVICEPATH' |cut -d '\"' -f2|tr -d '\\n'", device_id)))["stdout"]:"";
- // get vendorID, deviceID from sysfs path
- string vendor = deletechars((string) SCR::Read(.target.string, sformat("%1/vendor", sysfs)), "\n");
- string device = deletechars((string) SCR::Read(.target.string, sformat("%1/device", sysfs)), "\n");
- vendor=splitstring(vendor, "x")[1]:"";
- device=splitstring(device, "x")[1]:"";
- // get device name from vendorID, deviceID
- string device_name = ((map) SCR::Execute(.target.bash_output, sformat("echo $(grep -i '%1 ' /usr/share/pci.ids |cut -d' ' -f3-) $(grep -i '%1 %2' /usr/share/pci.ids |cut -d ' ' -f4-)|tr -d '\\n'", vendor, device)))["stdout"]:"";
-y2internal("device_name %1", device_name);
-// string device_name = NetworkDevices::GetValue(device_id,"NAME");
+ string device_name = NetworkDevices::GetValue(device_id,"NAME");
if ( (device_name == nil) || (device_name == "") ) {
//TRANSLATORS: Informs that device name is not known
device_name = _("Unknown device");
}
+ y2milestone ("device_name %1", device_name);
//avoid too long device names
if (size(device_name) > 30) {
device_name = substring (device_name, 0, 27) + "...";
@@ -241,8 +232,8 @@
return `VBox(
`VSpacing(1),
`Left(`Label(`id(`net_device), GetDeviceDescription(selected))),
- `Right(`PushButton(`id(`net_expert), _("&Change Device"))),
- `VSpacing(1)
+ `Right(`PushButton(`id(`net_expert), _("&Change Device")))
+ // `VSpacing(1)
);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.49/testsuite/tests/Internet.out new/yast2-network-2.15.50/testsuite/tests/Internet.out
--- old/yast2-network-2.15.49/testsuite/tests/Internet.out 2007-05-28 10:17:55.000000000 +0200
+++ new/yast2-network-2.15.50/testsuite/tests/Internet.out 2007-07-20 18:15:08.000000000 +0200
@@ -1,56 +1,90 @@
Read .target.tmpdir "/tmp"
Dump Fastest
Dir .network.section: ["dsl0", "eth0"]
+Log typ dsl, num 0
Dir .network.value."dsl0": ["DEVICE"]
Read .network.value."dsl0".DEVICE "eth0"
+Log typ eth, num 0
Dir .network.value."eth0": []
+Log typ dsl, num 0
+Log typ eth, num 0
Return true
Dump dsl0
Dump dsl
Dir .network.section: ["dsl0", "eth0"]
+Log typ dsl, num 0
Dir .network.value."dsl0": []
+Log typ eth, num 0
Dir .network.value."eth0": []
+Log typ dsl, num 0
+Log typ eth, num 0
Return true
Dump dsl0
Dump dsl
Dir .network.section: ["eth1", "tr0"]
+Log typ eth, num 1
Dir .network.value."eth1": []
+Log typ tr, num 0
Dir .network.value."tr0": []
+Log typ eth, num 1
+Log typ tr, num 0
Return true
Dump eth1
Dump netcard
Dir .network.section: ["dsl0", "tr0"]
+Log typ dsl, num 0
Dir .network.value."dsl0": []
+Log typ tr, num 0
Dir .network.value."tr0": []
+Log typ dsl, num 0
+Log typ tr, num 0
Return true
Dump dsl0
Dump dsl
Dir .network.section: ["dsl0", "ppp0"]
+Log typ dsl, num 0
Dir .network.value."dsl0": []
+Log typ ppp, num 0
Dir .network.value."ppp0": []
+Log typ dsl, num 0
+Log typ ppp, num 0
Return true
Dump dsl0
Dump dsl
Dir .network.section: ["ppp0", "tr1"]
+Log typ ppp, num 0
Dir .network.value."ppp0": []
+Log typ tr, num 1
Dir .network.value."tr1": []
+Log typ ppp, num 0
+Log typ tr, num 1
Return true
Dump ppp0
Dump modem
Dir .network.section: ["ppp0"]
+Log typ ppp, num 0
Dir .network.value."ppp0": []
+Log typ ppp, num 0
Return true
Dump ppp0
Dump modem
Dir .network.section: ["ippp0", "tr1"]
+Log typ ippp, num 0
Dir .network.value."ippp0": []
+Log typ tr, num 1
Dir .network.value."tr1": []
+Log typ ippp, num 0
+Log typ tr, num 1
Return true
Dump ippp0
Dump isdn
Dir .network.section: ["ippp0", "ppp0"]
+Log typ ippp, num 0
Dir .network.value."ippp0": []
+Log typ ppp, num 0
Dir .network.value."ppp0": []
+Log typ ippp, num 0
+Log typ ppp, num 0
Return true
Dump ippp0
Dump isdn
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.49/VERSION new/yast2-network-2.15.50/VERSION
--- old/yast2-network-2.15.49/VERSION 2007-07-18 14:50:45.000000000 +0200
+++ new/yast2-network-2.15.50/VERSION 2007-07-20 18:17:13.000000000 +0200
@@ -1 +1 @@
-2.15.49
+2.15.50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org