Hello community,
here is the log from the commit of package yast2-network
checked in at Sun Jun 22 09:01:54 CEST 2008.
--------
--- yast2-network/yast2-network.changes 2008-06-04 12:51:56.000000000 +0200
+++ yast2-network/yast2-network.changes 2008-06-21 19:26:04.000000000 +0200
@@ -2 +2,57 @@
-Wed Jun 4 12:48:24 CEST 2008 - mzugec@suse.cz
+Sat Jun 21 19:23:33 CEST 2008 - mzugec@suse.cz
+
+- enable smpppd when dsl connection configured (bnc#397966)
+- 2.17.4
+
+-------------------------------------------------------------------
+Fri Jun 20 15:11:11 CEST 2008 - mzugec@suse.cz
+
+- download firmware for b43 (bnc#400846)
+- 2.17.3
+
+-------------------------------------------------------------------
+Thu Jun 19 19:04:03 CEST 2008 - mzugec@suse.cz
+
+- CLI support for VLAN, bonding, bridge
+- 2.17.2
+
+-------------------------------------------------------------------
+Wed Jun 18 12:16:54 CEST 2008 - mzugec@suse.de
+
+- initial support for IPv6
+- prefix parameter in CLI
+- support for "/24" syntax as prefixlen
+- 2.17.1
+
+-------------------------------------------------------------------
+Fri Jun 13 17:07:11 CEST 2008 - mzugec@suse.cz
+
+- network installation broken (bnc#399645)
+- remove all historic dhcp-test related code
+- 2.17.0
+
+-------------------------------------------------------------------
+Fri Jun 13 16:23:20 CEST 2008 - mzugec@suse.cz
+
+- sleep while waiting for network (bnc#399062)
+
+-------------------------------------------------------------------
+Fri Jun 13 16:15:05 CEST 2008 - mzugec@suse.cz
+
+- button enable/disable behavior in Internet Test (bnc#391857)
+
+-------------------------------------------------------------------
+Fri Jun 6 17:16:20 CEST 2008 - mzugec@suse.cz
+
+- installation onto nfs - STARTMODE='nfsroot' (bnc#397410)
+- 2.16.50
+
+-------------------------------------------------------------------
+Thu Jun 5 13:59:51 CEST 2008 - mzugec@suse.cz
+
+- host module crashes when editing 'localhost' hostnames (bnc#397322)
+- fixed hosts write
+- 2.16.49
+
+-------------------------------------------------------------------
+Wed Jun 4 12:53:11 CEST 2008 - mzugec@suse.cz
@@ -7,0 +64,5 @@
+Mon Jun 2 16:19:15 CEST 2008 - mzugec@suse.cz
+
+- removed html tags in progress bar (bnc#393966)
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.16.48.tar.bz2
New:
----
yast2-network-2.17.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.Ab5614/_old 2008-06-22 08:43:41.000000000 +0200
+++ /var/tmp/diff_new_pack.Ab5614/_new 2008-06-22 08:43:41.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.16.48)
+# spec file for package yast2-network (Version 2.17.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-network
-Version: 2.16.48
+Version: 2.17.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.16.48.tar.bz2
+Source0: yast2-network-2.17.4.tar.bz2
Prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -27,8 +27,8 @@
BuildRequires: yast2-installation >= 2.15.27
BuildRequires: yast2 >= 2.16.6
BuildRequires: yast2-packager >= 2.16.37
-# GetInstArgs::automatic_configuration
-Requires: yast2 >= 2.16.46
+# needed for prefixlen support
+Requires: yast2 >= 2.17.1
Requires: sysconfig
Requires: yast2-packager >= 2.16.37
#GetLanguageCountry
@@ -71,7 +71,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.16.48
+%setup -n yast2-network-2.17.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -135,10 +135,41 @@
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
%exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog
+* Sat Jun 21 2008 mzugec@suse.cz
+- enable smpppd when dsl connection configured (bnc#397966)
+- 2.17.4
+* Fri Jun 20 2008 mzugec@suse.cz
+- download firmware for b43 (bnc#400846)
+- 2.17.3
+* Thu Jun 19 2008 mzugec@suse.cz
+- CLI support for VLAN, bonding, bridge
+- 2.17.2
+* Wed Jun 18 2008 mzugec@suse.de
+- initial support for IPv6
+- prefix parameter in CLI
+- support for "/24" syntax as prefixlen
+- 2.17.1
+* Fri Jun 13 2008 mzugec@suse.cz
+- network installation broken (bnc#399645)
+- remove all historic dhcp-test related code
+- 2.17.0
+* Fri Jun 13 2008 mzugec@suse.cz
+- sleep while waiting for network (bnc#399062)
+* Fri Jun 13 2008 mzugec@suse.cz
+- button enable/disable behavior in Internet Test (bnc#391857)
+* Fri Jun 06 2008 mzugec@suse.cz
+- installation onto nfs - STARTMODE='nfsroot' (bnc#397410)
+- 2.16.50
+* Thu Jun 05 2008 mzugec@suse.cz
+- host module crashes when editing 'localhost' hostnames (bnc#397322)
+- fixed hosts write
+- 2.16.49
* Wed Jun 04 2008 mzugec@suse.cz
- fixed command-line (bnc#397016)
- 2.16.48
* Mon Jun 02 2008 mzugec@suse.cz
+- removed html tags in progress bar (bnc#393966)
+* Mon Jun 02 2008 mzugec@suse.cz
- set link status up for all interfaces during installation
(bnc#395014)
- 2.16.47
++++++ yast2-network-2.16.48.tar.bz2 -> yast2-network-2.17.4.tar.bz2 ++++++
++++ 7258 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.16.48/configure.in new/yast2-network-2.17.4/configure.in
--- old/yast2-network-2.16.48/configure.in 2008-06-04 12:44:53.000000000 +0200
+++ new/yast2-network-2.17.4/configure.in 2008-06-21 19:20:14.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.16.47, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.17.3, 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.16.47"
+VERSION="2.17.3"
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.16.48/src/clients/lan.ycp new/yast2-network-2.17.4/src/clients/lan.ycp
--- old/yast2-network-2.16.48/src/clients/lan.ycp 2008-06-02 09:39:01.000000000 +0200
+++ new/yast2-network-2.17.4/src/clients/lan.ycp 2008-06-20 12:46:01.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network cards main file
* Authors: Michal Svec
*
- * $Id: lan.ycp 33584 2006-10-23 14:35:29Z mzugec $
+ * $Id: lan.ycp 48430 2008-06-19 17:04:40Z mzugec $
*
* Main file for network card configuration.
* Uses all other files.
@@ -102,10 +102,10 @@
"type" : "string",
"example" : "add type=ethernet bootproto=dhcp"
],
- "type" : $[
- "help" : _("Device type"),
+ "name" : $[
+ "help" : _("Configuration Name"),
"type" : "string",
- "example" : "add type=bluetooth"
+ "example" : "add name=bond0"
],
"bootproto" : $[
/* Commandline option help */
@@ -122,12 +122,32 @@
"help": _("Network mask"),
"type": "netmask"
],
+ "prefix" : $[
+ /* Commandline option help */
+ "help": _("Prefix lenght"),
+ "type": "string"
+ ],
+ "slaves" : $[
+ /* Commandline option help */
+ "help": _("Bond Slaves"),
+ "type": "string"
+ ],
+ "ethdevice" : $[
+ /* Commandline option help */
+ "help": _("Ethernet Device for VLAN"),
+ "type": "string"
+ ],
+ "bridge_ports" : $[
+ /* Commandline option help */
+ "help": _("Interfaces for Bridging"),
+ "type": "string"
+ ],
],
"mappings" : $[
"list" : [ "configured", "unconfigured" ],
"show" : [ "id" ],
- "add" : [ "type", "bootproto", "ip", "netmask" ],
- "edit" : [ "id", "type", "bootproto", "ip", "netmask" ],
+ "add" : [ "name", "bootproto", "ip", "netmask", "prefix", "slaves", "ethdevice", "bridge_ports" ],
+ "edit" : [ "id", "bootproto", "ip", "netmask", "prefix" ],
"delete": [ "id" ],
]
];
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.16.48/src/clients/save_network.ycp new/yast2-network-2.17.4/src/clients/save_network.ycp
--- old/yast2-network-2.16.48/src/clients/save_network.ycp 2008-06-02 09:39:01.000000000 +0200
+++ new/yast2-network-2.17.4/src/clients/save_network.ycp 2008-06-06 16:50:05.000000000 +0200
@@ -259,13 +259,13 @@
string dev_file=sformat("/etc/sysconfig/network/%1", ifcfg);
// string dev_file=sformat("/tmp/%1", ifcfg);
- if (!FileUtils::Exists(dev_file))
- {
+// if (!FileUtils::Exists(dev_file))
+// {
SCR::Write(.target.string, dev_file, network_configuration);
y2milestone("ifcfg file: %1", dev_file);
- }
- else
- y2warning("File exists %1", dev_file);
+// }
+// else
+// y2warning("File exists %1", dev_file);
}
/*
@@ -341,6 +341,7 @@
string device = NetworkStorage::getDevice( Installation::destdir );
y2internal("%1 directory is on %2 device", Installation::destdir, device);
network_disk = NetworkStorage::isDiskOnNetwork( device );
+ y2internal("Network based device: %1", network_disk);
// --------------------------------------------------------------
// Copy DHCP client cache so that we can request the same IP (#43974).
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.16.48/src/installation/dialogs.ycp new/yast2-network-2.17.4/src/installation/dialogs.ycp
--- old/yast2-network-2.16.48/src/installation/dialogs.ycp 2008-06-02 09:39:02.000000000 +0200
+++ new/yast2-network-2.17.4/src/installation/dialogs.ycp 2008-06-13 16:15:56.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Michal Svec
* Arvin Schnell
*
- * $Id: dialogs.ycp 43483 2008-01-08 17:49:13Z mzugec $
+ * $Id: dialogs.ycp 48300 2008-06-13 14:15:57Z mzugec $
*/
{
@@ -212,7 +212,7 @@
exit=true;
break;
case `yes:
- enableDevices(true);
+ enableDevices(size(items)>1);
break;
case `no:
enableDevices(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.16.48/src/lan/address.ycp new/yast2-network-2.17.4/src/lan/address.ycp
--- old/yast2-network-2.16.48/src/lan/address.ycp 2008-06-02 09:39:05.000000000 +0200
+++ new/yast2-network-2.17.4/src/lan/address.ycp 2008-06-18 13:29:45.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card adresss configuration dialogs
* Authors: Michal Svec
*
- * $Id: address.ycp 47508 2008-05-14 06:39:25Z mzugec $
+ * $Id: address.ycp 48381 2008-06-18 10:17:20Z mzugec $
*/
{
@@ -112,7 +112,7 @@
void StoreBridge(string key, map event)
{
settings["BRIDGE_PORTS"] = mergestring((list<string>)UI::QueryWidget (`id("BRIDGE_PORTS"), `SelectedItems), " ");
-y2internal("store bridge %1 : %2", key, settings["BRIDGE_PORTS"]:"");
+y2milestone("store bridge %1 : %2", key, settings["BRIDGE_PORTS"]:"");
}
@@ -195,7 +195,9 @@
switch(settings["BOOTPROTO"]:""){
case "static": UI::ChangeWidget(`id(`bootproto), `CurrentButton, `static);
UI::ChangeWidget(`id(`ipaddr), `Value, settings["IPADDR"]:"");
- UI::ChangeWidget(`id(`netmask), `Value, settings["NETMASK"]:"");
+ if (size(settings["PREFIXLEN"]:"")>0)
+ UI::ChangeWidget(`id(`netmask), `Value, sformat("/%1", settings["PREFIXLEN"]:""));
+ else UI::ChangeWidget(`id(`netmask), `Value, settings["NETMASK"]:"");
UI::ChangeWidget(`id(`hostname), `Value, settings["HOSTNAME"]:"");
break;
case "dhcp" : UI::ChangeWidget(`id(`bootproto), `CurrentButton, `dynamic);
@@ -234,10 +236,13 @@
case `none : settings["BOOTPROTO"]="none";
settings["IPADDR"] = "";
settings["NETMASK"] = "";
+ settings["PREFIXLEN"] = "";
break;
case `static: settings["BOOTPROTO"]="static";
settings["IPADDR"]=(string)UI::QueryWidget(`ipaddr, `Value);
- settings["NETMASK"]=(string)UI::QueryWidget(`netmask, `Value);
+ string mask = (string)UI::QueryWidget(`netmask, `Value);
+ if(substring(mask, 0,1)=="/") settings["PREFIXLEN"]=substring(mask, 1);
+ else settings["NETMASK"]=mask;
settings["HOSTNAME"]=(string)UI::QueryWidget(`hostname, `Value);
break;
default : switch ((symbol)UI::QueryWidget(`dyn, `Value)){
@@ -393,11 +398,20 @@
UI::SetFocus(`ipaddr);
return false;
}
- if (!Netmask::Check4((string) UI::QueryWidget (`netmask, `Value))){
- Popup::Error(_("No valid netmask."));
- UI::SetFocus(`netmask);
- return false;
+
+ string mask=(string) UI::QueryWidget (`netmask, `Value);
+ boolean valid_mask=false;
+ if (Netmask::Check4(mask)) valid_mask=true;
+ else if (regexpmatch(mask, "^/[[:digit:]]{1,2}$")) valid_mask=true;
+ else if (Netmask::Check6(mask)) valid_mask=true;
+ else if (regexpmatch(mask, "^/[[:digit:]]{1,3}$")) valid_mask=true;
+
+ if(!valid_mask){
+ Popup::Error(_("No valid netmask or prefix lenght."));
+ UI::SetFocus(`netmask);
+ return false;
}
+
string h = (string) UI::QueryWidget(`hostname, `Value );
if ( h != "" && !Hostname::CheckFQ(h)) {
Popup::Error(_("No valid hostname."));
@@ -686,6 +700,7 @@
"BOOTPROTO": LanItems::bootproto,
"IPADDR": LanItems::ipaddr,
"NETMASK": LanItems::netmask,
+ "PREFIXLEN": LanItems::prefix,
"REMOTEIP": LanItems::remoteip,
"HOSTNAME": hostname_initial,
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.16.48/src/lan/cmdline.ycp new/yast2-network-2.17.4/src/lan/cmdline.ycp
--- old/yast2-network-2.16.48/src/lan/cmdline.ycp 2008-06-04 12:49:55.000000000 +0200
+++ new/yast2-network-2.17.4/src/lan/cmdline.ycp 2008-06-20 12:46:01.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network cards cmdline handlers
* Authors: Michal Svec
*
- * $Id: cmdline.ycp 48055 2008-06-04 10:49:55Z mzugec $
+ * $Id: cmdline.ycp 48430 2008-06-19 17:04:40Z mzugec $
*/
{
@@ -28,9 +28,9 @@
foreach(integer position,any row, LanItems::Items, {
LanItems::current = position;
confList = add(confList, $[tostring(size(confList )) : $["id" : position,
- "rich_descr" : LanItems::getCurrentItem()["table_descr", "rich_descr"]:"",
- "descr" : LanItems::getCurrentItem()["table_descr", "table_descr", 0]:"",
- "addr" : LanItems::getCurrentItem()["table_descr", "table_descr", 1]:""]]);
+ "rich_descr" : LanItems::getCurrentItem()["table_descr", "rich_descr"]:"",
+ "descr" : LanItems::getCurrentItem()["table_descr", "table_descr", 0]:"",
+ "addr" : LanItems::getCurrentItem()["table_descr", "table_descr", 1]:""]]);
// count = count + 1;
});
return confList;
@@ -59,37 +59,6 @@
}
-define boolean AddIface (integer hw_id) {
- Lan::Add ();
- LanItems::SelectHW (hw_id);
- LanItems::SetDefaultsForHW ();
-
- // warn if selecting a card without a driver, #29296
- // TODO also for DSL...
-/*
- if (NetworkModules::Alias == "")
- {
- CommandLine::Print(_("The device does not have a driver module.
-The driver may be built in the kernel."));
- if (!CommandLine::YesNo ())
- {
- return false;
- }
- }
-*/
- // this is one of 3 places to install packages :-(
- // - kernel modules (InstallKernel): before loaded
- // - smpppd & kinternet: before net start
- // - wlan firmware: here, just because it is copied from modems
- // #45960
-/*
- if(Lan::Requires != [] && Lan::Requires != nil) {
- if(PackagesInstall(Lan::Requires) != `next)
- return false;
- }
-*/
- return true;
-}
/**
* Handler for action "show"
@@ -104,7 +73,6 @@
// create plain text from formated HTML
string text = sformat("echo \"%1\"|sed s/'<br>'/'\\n'/g|sed s/'<\\/li>'/'\\n'/g|sed s/'<[/a-z]*>'/''/g", value["rich_descr"]:"");
map descr = (map)SCR::Execute(.target.bash_output, text);
- y2internal("%1", descr);
CommandLine::Print( descr["stdout"]:"" );
}
});
@@ -125,17 +93,22 @@
* @param options action options
*/
define boolean AddHandler(map options) {
- LanItems::type = options["type"]:"ethernet";
- if (!contains(["arcnet", "bluetooth", "dummy", "ethernet", "fddi", "myrinet", "token-ring", "usb", "wireless"], LanItems::type)){
- Report::Error(_("Impossible value for type!"));
- return false;
- }
+ LanItems::AddNew();
+ Lan::Add();
+ LanItems::Items[LanItems::current, "ifcfg"]=options["name"]:"";
+ LanItems::type=NetworkInterfaces::device_type(options["name"]:"");
+ if (LanItems::type=="bond") LanItems::bond_slaves=splitstring(options["slaves"]:"", " ");
+ if (LanItems::type=="vlan") LanItems::vlan_etherdevice=options["ethdevice"]:"";
+ if (LanItems::type=="br") LanItems::bridge_ports=options["bridge_ports"]:"";
+
LanItems::bootproto = options["bootproto"]:"none";
if (!contains(["none", "static", "dhcp"], LanItems::bootproto)){
Report::Error(_("Impossible value for bootproto!"));
return false;
}
+
LanItems::ipaddr = options["ip"]:"";
+ LanItems::prefix = options["prefix"]:"";
LanItems::netmask = options["netmask"]:"255.255.255.0";
LanItems::startmode = options["startmode"]:"auto";
if (!contains(["auto", "ifplugd", "nfsroot"], LanItems::startmode)){
@@ -143,28 +116,8 @@
return false;
}
-
- CommandLine::Print(LanItems::type);
- CommandLine::Print(LanItems::bootproto);
- CommandLine::Print(LanItems::ipaddr);
- CommandLine::Print(LanItems::netmask);
-/*
- CommandLine::Print(sformat(_("Adding Device: %1"), dev));
-
- if(!Lan::Add()) {
- CommandLine::Print(Label::ErrorMsg());
- return false;
- }
-
- if(options["ipaddr"]:"" != "") Lan::ipaddr = options["ipaddr"]:"";
- if(options["netmask"]:"" != "") Lan::netmask = options["netmask"]:"";
- if(options["bootproto"]:"" != "") Lan::bootproto = options["bootproto"]:"";
- Lan::type = NetworkInterfaces::device_type(dev);
- Lan::device = NetworkInterfaces::device_num(dev);
-
- Lan::Commit();
- CommandLine::Print(_("Success"));
-*/
+ LanItems::Commit();
+ ListHandler($[]);
return true;
}
@@ -188,36 +141,7 @@
LanItems::Items[LanItems::current, "ifcfg"] = LanItems::interfacename;
}
-/*
- if (substring (dev, 0, 1) == "-") // unconfigured
- {
- integer i = tointeger (substring (dev, 1));
- if (! AddIface (i))
- {
- CommandLine::Print(_("Couldn't add interface"));
- return false;
- }
- } else
- {
- Lan::Edit(dev);
- if (LanItems::startmode == "managed")
- {
- // Continue-Cancel popup
- CommandLine::Print(_("The interface is currently set to be managed
-by the NetworkManager applet.
-
-If you edit the settings for this interface here,
-the interface will no longer be managed by NetworkManager.
-"));
-
- if (!CommandLine::YesNo()) return false;
- //
- // TODO move the defaults to GetDefaultsForHW
- LanItems::startmode = "ifplugd";
- }
- }
-*/
-if (contains(Map::Keys(options), "ip")) options["bootproto"] = "static";
+ if (contains(Map::Keys(options), "ip")) options["bootproto"] = "static";
LanItems::bootproto = options["bootproto"]:"none";
if (!contains(["none", "static", "dhcp"], LanItems::bootproto)){
@@ -226,7 +150,8 @@
}
if (LanItems::bootproto=="static"){
LanItems::ipaddr = options["ip"]:"";
- LanItems::netmask = options["netmask"]:"255.255.255.0";
+ if (size(options["prefix"]:"")>0) LanItems::prefix = options["prefix"]:"";
+ else LanItems::netmask = options["netmask"]:"255.255.255.0";
} else{
LanItems::ipaddr = "";
LanItems::netmask = "";
@@ -238,12 +163,8 @@
return false;
}
- CommandLine::Print(sformat("%1 :\t%2", _("Device Type"), LanItems::type));
- CommandLine::Print(sformat("%1 :\t%2", _("Bootproto"), LanItems::bootproto));
- CommandLine::Print(sformat("%1 :\t%2",_("IP Address"), LanItems::ipaddr));
- CommandLine::Print(sformat("%1 :\t%2",_("Mask"), LanItems::netmask));
LanItems::Commit();
-
+ ShowHandler(options);
return 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.16.48/src/modules/DNS.ycp new/yast2-network-2.17.4/src/modules/DNS.ycp
--- old/yast2-network-2.16.48/src/modules/DNS.ycp 2008-06-02 09:39:04.000000000 +0200
+++ new/yast2-network-2.17.4/src/modules/DNS.ycp 2008-06-02 16:20:00.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Hostname and DNS data
* Authors: Michal Svec
*
- * $Id: DNS.ycp 46855 2008-04-18 13:48:54Z jsrain $
+ * $Id: DNS.ycp 47991 2008-06-02 14:19:59Z mzugec $
*
* Manages resolv.conf and (fully qualified) hostname, also
* respecting DHCP.
@@ -309,7 +309,7 @@
if( update_resolv ) {
/* Progress step 3/3 */
- ProgressNextStage(_("Updating <tt>/etc/resolv.conf</tt>..."));
+ ProgressNextStage(_("Updating /etc/resolv.conf ..."));
/* update /etc/resolv.conf */
SCR::Write(.etc.resolv_conf.search, searchlist);
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.16.48/src/modules/Host.ycp new/yast2-network-2.17.4/src/modules/Host.ycp
--- old/yast2-network-2.16.48/src/modules/Host.ycp 2008-06-02 09:39:04.000000000 +0200
+++ new/yast2-network-2.17.4/src/modules/Host.ycp 2008-06-02 16:20:00.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Hosts data (/etc/hosts)
* Authors: Michal Svec
*
- * $Id: Host.ycp 46855 2008-04-18 13:48:54Z jsrain $
+ * $Id: Host.ycp 47991 2008-06-02 14:19:59Z mzugec $
*/
{
@@ -104,7 +104,7 @@
Progress::New(caption, " ", size(steps), steps, [], "");
- ProgressNextStage(_("Updating <tt>/etc/hosts</tt>..."));
+ ProgressNextStage(_("Updating /etc/hosts ..."));
/* Create if not exists, otherwise backup */
if(SCR::Read(.target.size, hosts_file) < 0)
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.16.48/src/modules/LanItems.ycp new/yast2-network-2.17.4/src/modules/LanItems.ycp
--- old/yast2-network-2.16.48/src/modules/LanItems.ycp 2008-06-02 09:39:04.000000000 +0200
+++ new/yast2-network-2.17.4/src/modules/LanItems.ycp 2008-06-20 15:02:50.000000000 +0200
@@ -58,6 +58,7 @@
global string ipaddr = "";
global string remoteip = "";
global string netmask = "";
+global string prefix = "";
global string startmode = "auto";
global boolean usercontrol = false;
@@ -151,7 +152,8 @@
"ipw3945" : "ipw-firmware",
"iwl3945" : "iwl3945-ucode",
"iwl4965" : "iwl4965-ucode",
- "bcm43xx" : "b43-fwcutter",
+ "b43" : "b43-fwcutter",
+ "bcm43xx" : "",
"prism54" : "",
"spectrum_cs" : "",
"zd1201" : "",
@@ -245,7 +247,6 @@
}
}
});
-y2internal("udev net_rules %1", net_rules);
SCR::Write(.udev_persistent.rules, net_rules);
SCR::Write(.udev_persistent.nil, []);
foreach(string dev, changed_devices, {
@@ -453,11 +454,13 @@
{
if (ip != "NONE")
{
- bullets = bullets + [
- ip == "DHCP" ? _("IP address assigned using DHCP") :
- sformat(_("IP address: %1, subnet mask %2")
- , ip, NetworkInterfaces::Current["NETMASK"]:""),
- ];
+ string prefixlen = NetworkInterfaces::Current["PREFIXLEN"]:"";
+ string descr = _("IP address assigned using DHCP");
+ if (ip != "DHCP") descr=(size(prefixlen)>0) ?
+ sformat(_("IP address: %1/%2"), ip, prefixlen) :
+ sformat(_("IP address: %1, subnet mask %2")
+ , ip, NetworkInterfaces::Current["NETMASK"]:"");
+ bullets = bullets + [ descr ];
}
// build aliases overview
if (size(NetworkInterfaces::Current["_aliases"]:$[])>0 && !NetworkService::IsManaged()){
@@ -742,13 +745,13 @@
/* address options */
bootproto = GetDeviceVar (devmap, defaults, "BOOTPROTO");
ipaddr = GetDeviceVar (devmap, defaults, "IPADDR");
+ prefix = GetDeviceVar (devmap, defaults, "PREFIXLEN");
remoteip = GetDeviceVar (devmap, defaults, "REMOTE_IPADDR");
netmask = GetDeviceVar (devmap, defaults, "NETMASK");
mtu = GetDeviceVar (devmap, defaults, "MTU");
ethtool_options = GetDeviceVar (devmap, defaults, "ETHTOOL_OPTIONS");
startmode = GetDeviceVar (devmap, defaults, "STARTMODE");
-y2internal("startmode %1", startmode);
usercontrol = GetDeviceVar (devmap, defaults, "USERCONTROL") == "yes";
description = GetDeviceVar (devmap, defaults, "NAME");
bond_option = GetDeviceVar(devmap, defaults, "BONDING_MODULE_OPTS");
@@ -815,6 +818,7 @@
global map SysconfigDefaults = $[
"BOOTPROTO": "static",
"IPADDR": "",
+ "PREFIXLEN": "",
"REMOTE_IPADDR": "",
"NETMASK": "",
"MTU": "",
@@ -934,11 +938,8 @@
/* general stuff */
description = BuildDescription (type, device, devmap, Hardware);
-y2internal("devmap %1", devmap);
-
SetDeviceVars(devmap, SysconfigDefaults);
-
hotplug = "";
/*
if(issubstring(device, "bus-pcmcia"))
@@ -1009,7 +1010,8 @@
// #104494 - always write IPADDR+NETMASK, even empty
newdev["IPADDR"] = ipaddr;
- newdev["NETMASK"] = netmask;
+ if(size(prefix)>0) newdev["PREFIXLEN"] = prefix;
+ else newdev["NETMASK"] = netmask;
// #50955 omit computable fields
newdev["BROADCAST"] = "";
newdev["NETWORK"] = "";
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.16.48/src/modules/Lan.ycp new/yast2-network-2.17.4/src/modules/Lan.ycp
--- old/yast2-network-2.16.48/src/modules/Lan.ycp 2008-06-02 09:39:04.000000000 +0200
+++ new/yast2-network-2.17.4/src/modules/Lan.ycp 2008-06-13 16:24:01.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec
*
- * $Id: Lan.ycp 47444 2008-05-12 09:50:34Z mzugec $
+ * $Id: Lan.ycp 48302 2008-06-13 14:24:01Z mzugec $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -477,6 +477,7 @@
break;
}
y2milestone("waiting for network ... %1", timeout);
+ sleep(1000);
timeout = timeout-1;
}
if (!network) Popup::Error(_("No network running"));
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.16.48/src/modules/NetHwDetection.ycp new/yast2-network-2.17.4/src/modules/NetHwDetection.ycp
--- old/yast2-network-2.16.48/src/modules/NetHwDetection.ycp 2008-06-02 09:42:13.000000000 +0200
+++ new/yast2-network-2.17.4/src/modules/NetHwDetection.ycp 2008-06-13 17:20:39.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network detection
* Authors: Michal Svec
*
- * $Id: NetHwDetection.ycp 47977 2008-06-02 07:42:13Z mzugec $
+ * $Id: NetHwDetection.ycp 48310 2008-06-13 15:20:40Z mzugec $
*
* <p>Detects network settings, using dhcp or sniffing network traffic</p>
*
@@ -69,11 +69,9 @@
*/
global boolean running = false;
-string device = "eth0";
string tmpdir = Directory::tmpdir;
list<string> detection_modules = [];
-boolean detection_interface = false;
/**
* Set up the first eth interface, if not already running
@@ -117,16 +115,6 @@
});
- /* Setup the interface */
-/*
- detection_interface=false;
- if(SCR::Execute(.target.bash, sformat("/sbin/ifconfig %1 2>&1 | grep 'inet6\\? addr'", device), $["LC_ALL":"C"]) != 0) {
- y2milestone("Setting up interface %1 ...", device);
- SCR::Execute(.target.bash, sformat("/sbin/ifconfig %1 up 2>&1", device));
- detection_interface=true;
- }
- y2debug("detection_interface=%1", detection_interface);
-*/
string command = "ls /sys/class/net|grep -v \"^lo$\"";
map output = (map)SCR::Execute(.target.bash_output, command);
if (output["exit"]:-1==0){
@@ -135,7 +123,6 @@
foreach(string ifc, interfaces, {
y2milestone("Setting up interface %1", ifc);
SCR::Execute(.target.bash, sformat("ip link set %1 up", ifc));
- if (ifc == device) detection_interface=true;
});
} else y2error("Error while execute %1 : %2", command, output);
@@ -143,97 +130,8 @@
return true;
}
-/**
- * Shut down the eth interface, previously set up by StartEthInterface
- * @return true if success
- */
-define boolean StopEthInterface() {
-
- y2milestone("Network detection finish");
- if(detection_interface) {
- y2milestone("Shut down interface %1 ...", device);
- SCR::Execute(.target.bash, sformat("/sbin/ifconfig %1 down 2>&1", device));
- }
- detection_interface = false;
-
- foreach(string mod, detection_modules, {
- y2milestone("NOT removing module %1 ...", mod);
- // #36478 SCR::Execute(.target.bash, sformat("/sbin/rmmod %1 2>&1", mod));
- });
- y2milestone("Network detection finish (end)");
- return true;
-}
-
-/**
- * Start detection
- * @return true if success
- */
-define boolean StartDetection() {
-
- y2milestone("Network detection start");
-
- /* Start DHCP detection */
- SCR::Execute(.target.bash, sformat("/bin/rm -f %1/dhcpcd-*", tmpdir));
-
- // #46214
- if (true)
- {
- y2milestone ("dhcpcd-test skipped");
- }
- else
- {
- // Do not lose our lease just because of the test,
- // pretend we are someone else. #46214#c18
- SCR::Execute(.target.bash, sformat("/usr/sbin/dhcpcd-test %1 -I yast-detection-id > %2/dhcpcd-%1.info", device, tmpdir));
- }
-
- y2milestone("Network detection start (end)");
- return true;
-}
-
-/**
- * Finish detection
- * @return true if success
- */
-define boolean StopDetection() {
-
- y2milestone("Network detection stop");
-
- result = $[];
-
- /* Read DHCP data */
- string info = sformat("%1/dhcpcd-%2.info", tmpdir, device);
- // info = "/var/lib/dhcpcd/dhcpcd-eth0.info";
-
- if(SCR::Read(.target.size, info) > 0) {
-
- path detpath = .detection.dhcp;
- string tmpfile = tmpdir + "/detection_dhcp.scr";
- string scrfile = sformat("%1\n\n`ag_ini(`SysConfigFile(\"%2\"))\n", detpath, info);
- SCR::Write(.target.string, tmpfile, scrfile);
- SCR::RegisterAgent(detpath, tmpfile);
-
- list<string> keys = SCR::Dir(detpath);
- y2debug("keys=%1", keys);
-
- maplist(string k, keys, {
- string v = (string) SCR::Read(add(detpath, k));
- y2debug("%1=%2", k, v);
- /* FIXME: duplicate keys (make list? add with suffix1, etc? ...? */
- result[k] = v;
- });
- SCR::UnregisterAgent(detpath);
-
- }
-
- /* Finish DHCP detection */
- // nothing, #44557
-
- y2milestone("Network detection stop (end)");
- return true;
-}
/**
* Start the detection
@@ -247,7 +145,7 @@
y2milestone("IFCONFIG1: %1", SCR::Execute(.target.bash_output, "/sbin/ifconfig"));
boolean ret = false;
- if(StartEthInterface() && StartDetection()) {
+ if(StartEthInterface()) {
running = true;
ret = true;
}
@@ -269,12 +167,9 @@
running = false;
y2milestone("IFCONFIG3: %1", SCR::Execute(.target.bash_output, "/sbin/ifconfig"));
- boolean ret = StopDetection();
- ret = StopEthInterface() && ret;
-y2milestone("IFCONFIG4: %1", SCR::Execute(.target.bash_output, "/sbin/ifconfig"));
- y2milestone("Detection stop result: %1", ret);
- return ret;
+ y2milestone("Detection stop ");
+ return 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.16.48/src/routines/runtime.ycp new/yast2-network-2.17.4/src/routines/runtime.ycp
--- old/yast2-network-2.16.48/src/routines/runtime.ycp 2008-06-02 09:39:04.000000000 +0200
+++ new/yast2-network-2.17.4/src/routines/runtime.ycp 2008-06-21 19:25:24.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Runtime routines
* Authors: Michal Svec
*
- * $Id: runtime.ycp 46855 2008-04-18 13:48:54Z jsrain $
+ * $Id: runtime.ycp 48472 2008-06-21 17:25:23Z mzugec $
*/
{
@@ -103,8 +103,8 @@
// (#299033) - if not forced, user can continue also without packages
if (!install_force) PackageSystem::CheckAndInstallPackages(["smpppd", "kinternet"]);
else
- Package::InstallAllMsg(["smpppd", "kinternet"], message);
-
+ ret = Package::InstallAllMsg(["smpppd", "kinternet"], message);
+ }
ret = Service::Enable("smpppd") && ret;
@@ -114,8 +114,7 @@
ret = Service::Reload("smpppd") && ret;
else
ret = Service::Start("smpppd") && ret;
- }
- }
+ }
}
return ret;
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.16.48/src/services/host.ycp new/yast2-network-2.17.4/src/services/host.ycp
--- old/yast2-network-2.16.48/src/services/host.ycp 2008-06-02 09:39:03.000000000 +0200
+++ new/yast2-network-2.17.4/src/services/host.ycp 2008-06-05 14:11:25.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Hosts configuration dialogs
* Authors: Michal Svec
*
- * $Id: host.ycp 47553 2008-05-15 10:41:35Z kmachalkova $
+ * $Id: host.ycp 48093 2008-06-05 12:11:25Z mzugec $
*
* Hosts configuration dialogs
*/
@@ -68,11 +68,11 @@
<b>Host Aliases</b>, separated by spaces.</p>
");
- integer items = 0;
integer max = 0;
list<term> table_items = [];
y2debug("hosts=%1", Host::hosts);
+
/* make ui items from the hosts list */
maplist(string host, list<string> names, (map) Host::hosts, {
if(size(names) < 1) {
@@ -80,17 +80,14 @@
return;
}
foreach (string s, names, {
- string name = regexpsub(s, "^([^ \t]+)[ \t].*$", "\\1");
- string aliases = regexpsub(s, "^[^ \t]+[ \t]+(.*)[ \t]*$", "\\1");
- term item = `item(`id(items), host, name, aliases);
+ list<string> row=splitstring(s, " ");
+ string aliases = mergestring(remove(row, 0), " ");
+ term item = `item(`id(size(table_items)), host, row[0]:"", aliases);
table_items = add(table_items, item);
- items = items + 1;
});
});
-
y2debug("table_items=%1", table_items);
- y2debug("items=%1", items);
- max = items;
+ max = size(table_items);
/* Hosts dialog contents */
term contents = `HBox(
@@ -132,13 +129,13 @@
Label::BackButton(), Label::OKButton());
UI::ChangeWidget(`id(`table), `Items, table_items);
- if(items > 0) UI::SetFocus(`id(`table));
+ if(size(table_items) > 0) UI::SetFocus(`id(`table));
any ret = nil;
while(true) {
- UI::ChangeWidget(`id(`edit), `Enabled, items > 0);
- UI::ChangeWidget(`id(`delete), `Enabled, items > 0);
+ UI::ChangeWidget(`id(`edit), `Enabled, size(table_items) > 0);
+ UI::ChangeWidget(`id(`delete), `Enabled, size(table_items) > 0);
ret = UI::UserInput();
y2debug("ret=%1", ret);
@@ -150,25 +147,12 @@
}
/* add host */
else if(ret == `add) {
- // list forbidden = maplist(term e, table_items, {
- // return e[1]:"";
- // });
- // term item = HostDialog(max, `empty(), forbidden);
term item = HostDialog(max, `empty());
if(item == nil)
continue;
- else {
- Host::modified = true;
- string ip = (item[1]:"");
- string entry = mergestring([item[2]:"", item[3]:""]," ");
-
- Host::hosts[ip] = add(Host::hosts[ip]:[], entry);
- }
-
table_items = add(table_items, item);
UI::ChangeWidget(`id(`table), `Items, table_items);
UI::ChangeWidget(`id(`table), `CurrentItem, max);
- items = items + 1;
max = max + 1;
continue;
}
@@ -207,12 +191,7 @@
y2debug("oldentry: %1", oldentry);
string ip = item[1]:"";
string oldip = olditem[1]:"";
-
- Host::hosts[oldip] = filter(string dns, Host::hosts[oldip]:[], {
- return regexpsub(dns, "([ \t]+)", " ") != regexpsub(oldentry, "([ \t]+)", " ");
- });
y2debug("Deleting: %1 (%2)", oldip, ip);
- Host::hosts[ip] = add(Host::hosts[ip]:[], entry);
return item;
}
@@ -241,16 +220,12 @@
string ip = e[1]:"";
if(cur == e[0, 0]:nil) {
if(ip != "" && ip != nil) {
- Host::hosts[ip] = filter(string dns, Host::hosts[ip]:[], {
- return dns != entry;
- });
return false;
}
}
return true;
});
UI::ChangeWidget(`id(`table), `Items, table_items);
- items = size(table_items);
Host::modified = true;
continue;
}
@@ -259,6 +234,15 @@
}
else if(ret == `next) {
/* check_ */
+ if(Host::modified){
+ Host::hosts=$[];
+ foreach(term row, table_items, {
+ string value = mergestring([row[2]:"", row[3]:""], " ");
+ string key = row[1]:"";
+ if(!haskey(Host::hosts, key))Host::hosts[key]=[ value ];
+ else Host::hosts[key] = add(Host::hosts[key]:[], value);
+ });
+ }
break;
}
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.16.48/VERSION new/yast2-network-2.17.4/VERSION
--- old/yast2-network-2.16.48/VERSION 2008-06-04 12:46:51.000000000 +0200
+++ new/yast2-network-2.17.4/VERSION 2008-06-21 19:23:31.000000000 +0200
@@ -1 +1 @@
-2.16.48
+2.17.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org