Hello community,
here is the log from the commit of package yast2-network
checked in at Fri Sep 12 17:28:39 CEST 2008.
--------
--- yast2-network/yast2-network.changes 2008-09-10 16:03:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2008-09-12 15:41:42.991241000 +0200
@@ -1,0 +2,12 @@
+Fri Sep 12 15:36:38 CEST 2008 - mzugec@suse.cz
+
+- hyperlinks to revert bridged proposal (FaTE#303386)
+- 2.17.26
+
+-------------------------------------------------------------------
+Fri Sep 12 11:39:38 CEST 2008 - kmachalkova@suse.cz
+
+- Added CLI support for routing settings (FaTE#120078)
+- 2.17.26
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.17.25.tar.bz2
New:
----
yast2-network-2.17.26.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.I20135/_old 2008-09-12 17:28:33.000000000 +0200
+++ /var/tmp/diff_new_pack.I20135/_new 2008-09-12 17:28:33.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.17.25)
+# spec file for package yast2-network (Version 2.17.26)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-network
-Version: 2.17.25
+Version: 2.17.26
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.17.25.tar.bz2
+Source0: yast2-network-2.17.26.tar.bz2
Prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -79,7 +79,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.17.25
+%setup -n yast2-network-2.17.26
%build
%{prefix}/bin/y2tool y2autoconf
@@ -142,8 +142,13 @@
%doc %{prefix}/share/doc/packages/yast2-network
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
%exclude %{prefix}/share/doc/packages/yast2-network/README
-
%changelog
+* Fri Sep 12 2008 mzugec@suse.cz
+- hyperlinks to revert bridged proposal (FaTE#303386)
+- 2.17.26
+* Fri Sep 12 2008 kmachalkova@suse.cz
+- Added CLI support for routing settings (FaTE#120078)
+- 2.17.26
* Wed Sep 10 2008 mzugec@suse.de
- special proposal for virtualization network (fate#303386)
- 2.17.25
++++++ yast2-network-2.17.25.tar.bz2 -> yast2-network-2.17.26.tar.bz2 ++++++
++++ 9612 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.17.25/configure.in new/yast2-network-2.17.26/configure.in
--- old/yast2-network-2.17.25/configure.in 2008-09-09 22:20:49.000000000 +0200
+++ new/yast2-network-2.17.26/configure.in 2008-09-12 15:39:02.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-network
dnl
-dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.17.24, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.17.26, 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.17.24"
+VERSION="2.17.26"
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.17.25/src/clients/general_proposal.ycp new/yast2-network-2.17.26/src/clients/general_proposal.ycp
--- old/yast2-network-2.17.25/src/clients/general_proposal.ycp 2008-08-12 13:42:02.000000000 +0200
+++ new/yast2-network-2.17.26/src/clients/general_proposal.ycp 2008-09-12 15:38:06.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network mode + ipv6 proposal
* Authors: Martin Vidner
*
- * $Id: general_proposal.ycp 39111 2007-07-02 14:53:49Z mzugec $
+ * $Id: general_proposal.ycp 51122 2008-09-12 13:37:48Z mzugec $
*
* This is not a standalone proposal, it depends on lan_proposal. It
* must run after it.
@@ -53,7 +53,6 @@
else if(func == "AskUser") {
string chosen_id = param["chosen_id"]:"";
symbol seq = `next;
-
if (chosen_id == "lan--nm-enable")
{
NetworkService::SetManaged (true);
@@ -70,6 +69,14 @@
{
Lan::SetIPv6(false);
}
+ else if(chosen_id == "virtual-enable")
+ {
+ Lan::virt_net_proposal=true;
+ }
+ else if(chosen_id == "virtual-revert")
+ {
+ Lan::virt_net_proposal=false;
+ }
else
{
Wizard::CreateDialog();
@@ -80,7 +87,6 @@
}
LanItems::proposal_valid = false; // repropose
LanItems::SetModified ();
-
ret = $[
"workflow_sequence" : seq
];
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.17.25/src/clients/lan_proposal.ycp new/yast2-network-2.17.26/src/clients/lan_proposal.ycp
--- old/yast2-network-2.17.25/src/clients/lan_proposal.ycp 2008-08-12 13:42:02.000000000 +0200
+++ new/yast2-network-2.17.26/src/clients/lan_proposal.ycp 2008-09-12 15:38:06.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Lan configuration proposal
* Authors: Michal Svec
*
- * $Id: lan_proposal.ycp 46138 2008-04-04 16:31:10Z locilka $
+ * $Id: lan_proposal.ycp 51122 2008-09-12 13:37:48Z mzugec $
*/
{
@@ -48,6 +48,12 @@
// NM wants us to repropose but while at it Lan::Read should not
// think it does a full reread and unset Lan::modified. #147270
Lan::Read (force_reset? `nocache: `cache);
+ if (Lan::virt_net_proposal==nil){
+ if(PackageSystem::Installed("xen")||PackageSystem::Installed("kvm")||
+ PackageSystem::Installed("qemu")||PackageSystem::Installed("virtualbox-ose"))
+ Lan::virt_net_proposal = true;
+ else Lan::virt_net_proposal = false;
+ }
Lan::Propose();
Progress::set (progress_orig);
if (! GetInstArgs::automatic_configuration())
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.17.25/src/clients/routing.ycp new/yast2-network-2.17.26/src/clients/routing.ycp
--- old/yast2-network-2.17.25/src/clients/routing.ycp 2008-08-12 13:42:02.000000000 +0200
+++ new/yast2-network-2.17.26/src/clients/routing.ycp 2008-09-12 15:38:06.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Routing client
* Authors: Michal Svec
*
- * $Id: routing.ycp 36863 2007-03-12 10:47:37Z mzugec $
+ * $Id: routing.ycp 51079 2008-09-12 09:35:53Z kmachalkova $
*
* Main file for routing configuration.
* Uses all other files.
@@ -23,6 +23,7 @@
import "Wizard";
import "CommandLine";
+import "String";
import "RichText";
import "NetworkService";
@@ -59,19 +60,187 @@
return ret;
}
+string PrintableRoutingTable( list <map> items )
+{
+ list table_items = [];
+ foreach (map route, items, {
+ table_items = add( table_items,
+ [
+ route["destination"]:"",
+ route["gateway"]:"",
+ route["netmask"]:"-",
+ route["device"]:"-",
+ route["extrapara"]:""
+ ]
+ );
+
+ });
+
+ string headline = String::UnderlinedHeader( _("Routing Table"), 0 );
+ string table = String::TextTable(
+ [
+ _("Destination"),
+ _("Gateway"),
+ _("Netmask"),
+ _("Device"),
+ _("Options")
+ ],
+ table_items,
+ $[] );
+
+ return headline + "\n" + table;
+
+}
/**
* Handler for action "list"
* @param options action options
*/
-define boolean ListHandler(map options) {
+define boolean ListHandler( map options ) {
+
+ CommandLine::Print( PrintableRoutingTable( Routing::Routes ) );
+ CommandLine::Print("");
+
+ return true;
+}
+
+define boolean ShowHandler( map options ) {
+
+ list <map> routes = filter( map route, Routing::Routes, {
+ return (route["destination"]:"" == options["dest"]:"");
+ });
+
+ if ( routes != [] && routes != nil)
+ {
+ CommandLine::Print( PrintableRoutingTable(routes) );
+ CommandLine::Print("");
+ }
+ else
+ {
+ CommandLine::Error( sformat(_("No entry for destination '%1' in routing table"), options["dest"]:"") );
+ return false;
+ }
+
+ return true;
+}
+
+define boolean IPFWHandler( map options ) {
+ CommandLine::Print( String::UnderlinedHeader(_("IP Forwarding:"), 0) );
+
+ if (options["show"]:nil != nil)
+ {
+ CommandLine::Print("");
+ if ( Routing::Forward )
+ CommandLine::Print(_("IP forwarding is enabled"));
+ else
+ CommandLine::Print(_("IP forwarding is disabled"));
+ CommandLine::Print("");
+ }
+ else if (options["on"]:nil != nil)
+ {
+ CommandLine::Print("");
+ CommandLine::Print(_("Enabling IP forwarding..."));
+ CommandLine::Print("");
+ Routing::Forward = true;
+ }
+ else if (options["off"]:nil != nil)
+ {
+ CommandLine::Print("");
+ CommandLine::Print(_("Disabling IP forwarding..."));
+ CommandLine::Print("");
+ Routing::Forward = false;
+ }
+ return true;
+}
+
+define boolean AddEditHandler( symbol addedit, map options ) {
+ list <map> routes = Routing::Routes;
+ string destination = options["dest"]: "";
+ string gateway = options["gateway"]: "";
+ string netmask = options["netmask"]: "-";
+ string device = options["dev"]: "-";
+ string extrapara = options["options"]: "";
+
+ if (addedit == `add)
+ {
+ if ( destination == "" || gateway == "" ) {
+ CommandLine::Error( _("At least destination and gateway IP addresses must be specified"));
+ return false;
+ }
+
+ CommandLine::Print( sformat( _("Adding '%1' destination to routing table ..."), destination) );
+ routes = add( routes,
+ $[
+ "destination" : destination,
+ "gateway" : gateway,
+ "netmask" : netmask,
+ "device" : device,
+ "extrapara" : extrapara,
+ ] );
+ }
+ else if ( addedit == `edit)
+ {
+ if ( destination == "") {
+ CommandLine::Error( _("Destination IP address must be specified"));
+ return false;
+ }
+ if ( size( options) < 2 ) {
+ CommandLine::Error( _("At least one of the following parameters (gateway, netmask, device, options) must be specified"));
+ return false;
+ }
+
+ boolean found = false;
+ routes = maplist( map m, routes, {
+ if ( m["destination"]:nil == destination )
+ {
+ m["gateway"] = gateway;
+ m["netmask"] = netmask;
+ m["device"] = device;
+ m["extrapara"] = extrapara;
+ found = true;
+ }
+ return m;
+ });
+
+ if (found) {
+ CommandLine::Print( sformat( _("Updating '%1' destination in routing table ..."), destination) );
+ }
+ else {
+ CommandLine::Error( sformat(_("No entry for destination '%1' in routing table"), destination) );
+ return false;
+ }
+ }
+
+ Routing::Routes = routes;
+ return true;
+}
+
+define boolean AddHandler( map options ) {
+ AddEditHandler( `add, options );
+ return true;
+}
+define boolean EditHandler( map options ) {
+ AddEditHandler( `edit, options );
+ return true;
+}
+define boolean DeleteHandler( map options ) {
- string summary = "";
- /* Command line output Headline */
- summary = "\n" + _("Routing Configuration Summary:") + "\n\n" +
- RichText::Rich2Plain(Routing::Summary()) + "\n";
+ boolean found = false;
+ Routing::Routes = maplist( map m, Routing::Routes, {
+ if ( m["destination"]:nil == options["dest"]:nil )
+ found = true;
+ else
+ return m;
+ });
+
+ if (found) {
+ CommandLine::Print( sformat( _("Deleting '%1' destination from routing table ..."), options["dest"]:"") );
+ return true;
+ }
+ else {
+ CommandLine::Error( sformat(_("No entry for destination '%1' in routing table"), options["dest"]:"") );
+ return false;
+ }
- y2debug("%1", summary);
- CommandLine::Print(summary);
return true;
}
@@ -87,11 +256,76 @@
"finish" : Routing::Write, // FIXME
"actions" : $[
"list" : $[
- /* Commandline command help */
- "help" : _("Display configuration summary"),
- "handler" : ListHandler,
+ "help" : _("Show complete routing table"),
+ "handler" : ListHandler,
+ ],
+ "show" : $[
+ "help" : _("Show routing table entry for selected destination"),
+ "handler" : ShowHandler,
+ "example" : "show dest=10.10.1.0"
+ ],
+ "ip-forwarding" : $[
+ "help" : _("IP forwarding settings"),
+ "handler" : IPFWHandler,
+ "example" : [
+ "ip-forwarding show",
+ "ip-forwarding on",
+ ]
+ ],
+ "add" : $[
+ "help" : _("Add new route"),
+ "handler" : AddHandler,
+ "example" : "add dest=10.10.1.0 gateway=10.10.1.1 netmask=255.255.255.0"
+ ],
+ "edit" : $[
+ "help" : _("Edit an existing route"),
+ "handler" : EditHandler,
+ "example" : "edit dest=10.10.1.0 gateway=10.10.1.1 netmask=255.255.255.0"
+ ],
+ "delete" : $[
+ "help" : _("Delete an existing route"),
+ "handler" : DeleteHandler,
+ "example" : "delete dest=10.10.1.0"
+ ],
+ ],
+ "options" : $[
+ "dest" : $[
+ "type" : "string",
+ "help" : _("Destination IP address"),
+ ],
+ "gateway" : $[
+ "type" : "string",
+ "help" : _("Gateway IP address"),
+ ],
+ "netmask" : $[
+ "type" : "string",
+ "help" : _("Subnet mask")
+ ],
+ "dev" : $[
+ "type" : "string",
+ "help" : _("Network device")
+ ],
+ "options" : $[
+ "type" : "string",
+ "help" : _("Additional options")
+ ],
+ "show" : $[
+ "help" : _("Show current settings")
+ ],
+ "on" : $[
+ "help" : _("Enable IP forwarding")
+ ],
+ "off" : $[
+ "help" : _("Disable IP forwarding")
],
],
+ "mappings" : $[
+ "show" : [ "dest" ],
+ "ip-forwarding" : [ "show", "on", "off" ],
+ "add" : [ "dest", "gateway", "netmask", "dev", "options" ],
+ "edit" : [ "dest", "gateway", "netmask", "dev", "options" ],
+ "delete" : [ "dest" ]
+ ]
];
any ret = CommandLine::Run(cmdline);
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.17.25/src/modules/Lan.ycp new/yast2-network-2.17.26/src/modules/Lan.ycp
--- old/yast2-network-2.17.25/src/modules/Lan.ycp 2008-09-10 16:01:43.000000000 +0200
+++ new/yast2-network-2.17.26/src/modules/Lan.ycp 2008-09-12 15:38:06.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec
*
- * $Id: Lan.ycp 50962 2008-09-10 14:01:42Z mzugec $
+ * $Id: Lan.ycp 51122 2008-09-12 13:37:48Z mzugec $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -55,6 +55,8 @@
*/
// FIXME: MOD global map Module = $[];
+// propose configuration for virtual networks (bridged) ?
+global boolean virt_net_proposal = nil;
/**
* autoinstallation: if true, write_only is disabled and the network settings
@@ -573,10 +575,13 @@
global define list SummaryGeneral () {
string status_nm = nil;
string status_v6 = nil;
+ string status_virt_net = nil;
string href_nm = nil;
string href_v6 = nil;
+ string href_virt_net = nil;
string link_nm = nil;
string link_v6 = nil;
+ string link_virt_net = nil;
string header_nm = _("Network Mode");
if (NetworkService::IsManaged ())
@@ -612,11 +617,26 @@
// enable ipv6 support
link_v6 = Hyperlink (href_v6, _("Enable IPv6"));
}
-
+ if ( PackageSystem::Installed("xen")||PackageSystem::Installed("kvm")||
+ PackageSystem::Installed("qemu")||PackageSystem::Installed("virtualbox-ose")
+ ){
+ if (virt_net_proposal){
+ href_virt_net = "virtual-revert";
+ status_virt_net = _("Proposed bridged configuration for virtual machine network");
+ link_virt_net = Hyperlink(href_virt_net, _("Use non-bridged configuration"));
+ } else {
+ href_virt_net = "virtual-enable";
+ status_virt_net = _("Proposed non-bridged network configuration");
+ link_virt_net = Hyperlink(href_virt_net, _("Use bridged configuration"));
+ }
+ }
string descr = sformat ("<ul><li>%1: %2 (%3)</li></ul>
<ul><li>%4 (%5)</li></ul>", header_nm, status_nm, link_nm,
status_v6, link_v6);
+ if (link_virt_net!=nil) descr=sformat("%1
+ <ul><li>%2 (%3)</li></ul>", descr, status_virt_net, link_virt_net);
list<string> links = [ href_nm, href_v6 ];
+ if (href_virt_net!=nil) links = add (links, href_virt_net);
return [descr, links];
}
@@ -729,9 +749,7 @@
y2milestone("NetworkConfig::DHCP=%1", NetworkConfig::DHCP);
// test if we have any virtualization installed
- boolean has_virtualization = PackageSystem::Installed("xen")||PackageSystem::Installed("kvm")||
- PackageSystem::Installed("qemu")||PackageSystem::Installed("virtualbox-ose");
- if (has_virtualization)
+ if (virt_net_proposal)
{
y2milestone("Virtualization [xen|kvm|qemu|virtualbox-ose] detected - will propose virtualization network");
// in case of virtualization use special proposal
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.17.25/VERSION new/yast2-network-2.17.26/VERSION
--- old/yast2-network-2.17.25/VERSION 2008-09-09 22:34:42.000000000 +0200
+++ new/yast2-network-2.17.26/VERSION 2008-09-12 15:38:06.000000000 +0200
@@ -1 +1 @@
-2.17.25
+2.17.26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org