Hello community,
here is the log from the commit of package yast2-network for openSUSE:11.4
checked in at Thu Jun 23 15:06:14 CEST 2011.
--------
--- old-versions/11.4/all/yast2-network/yast2-network.changes 2011-01-03 17:20:38.000000000 +0100
+++ 11.4/yast2-network/yast2-network.changes 2011-06-22 15:03:12.000000000 +0200
@@ -1,0 +2,28 @@
+Mon May 30 16:40:55 CEST 2011 - mvidner@suse.cz
+
+- WebYaST: also update /etc/hosts, for hostname -f (bnc#694283#c8)
+- 2.20.12
+
+-------------------------------------------------------------------
+Thu May 26 15:44:14 UTC 2011 - coolo@novell.com
+
+- Switch is not used, so don't require it (removed from perl 5.13.1)
+
+-------------------------------------------------------------------
+Wed Apr 13 16:17:19 CEST 2011 - mvidner@suse.cz
+
+- AutoYaST: networking/start_immediately was ignored (bnc#655571, bnc#675844)
+- 2.20.11
+
+-------------------------------------------------------------------
+Tue Feb 15 15:19:47 CET 2011 - mvidner@suse.cz
+
+- DSL: linux-atm-lib.rpm was renamed to libatm1.rpm (bnc#668586)
+
+-------------------------------------------------------------------
+Mon Jan 17 14:10:10 UTC 2011 - mvidner@novell.com
+
+- fixed progress messages being out of sync when writing LAN config
+ (reported by bmwiedemann)
+
+-------------------------------------------------------------------
Package does not exist at destination yet. Using Fallback old-versions/11.4/all/yast2-network
Destination is old-versions/11.4/UPDATES/all/yast2-network
calling whatdependson for 11.4-i586
Old:
----
yast2-network-2.20.10.tar.bz2
New:
----
yast2-network-2.20.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.PXAWnx/_old 2011-06-23 15:05:16.000000000 +0200
+++ /var/tmp/diff_new_pack.PXAWnx/_new 2011-06-23 15:05:16.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.20.10)
+# spec file for package yast2-network
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,16 +19,16 @@
Name: yast2-network
-Version: 2.20.10
-Release: 1
+Version: 2.20.12
+Release: 0.<RELEASE2>
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.20.10.tar.bz2
+Source0: yast2-network-2.20.12.tar.bz2
Prefix: /usr
Group: System/YaST
-License: GPLv2+
+License: GPL v2 or later
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
BuildRequires: update-desktop-files
@@ -62,7 +62,7 @@
Summary: YaST2 - Network Configuration
%package devel-doc
-License: GPLv2+
+
Group: System/YaST
Summary: YaST2 - Developer documentation for yast2-network
@@ -73,7 +73,7 @@
This package contains autogenerated documentation for yast2-network
%prep
-%setup -n yast2-network-2.20.10
+%setup -n yast2-network-2.20.12
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-network-2.20.10.tar.bz2 -> yast2-network-2.20.12.tar.bz2 ++++++
++++ 1809 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.20.10/MAINTAINER new/yast2-network-2.20.12/MAINTAINER
--- old/yast2-network-2.20.10/MAINTAINER 2006-11-06 14:35:04.000000000 +0100
+++ new/yast2-network-2.20.12/MAINTAINER 2011-06-22 14:37:32.000000000 +0200
@@ -1 +1 @@
-Michal Zugec
+Martin Vidner
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.20.10/VERSION new/yast2-network-2.20.12/VERSION
--- old/yast2-network-2.20.10/VERSION 2011-01-03 16:00:07.000000000 +0100
+++ new/yast2-network-2.20.12/VERSION 2011-06-22 14:37:32.000000000 +0200
@@ -1 +1 @@
-2.20.10
+2.20.12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.20.10/configure.in new/yast2-network-2.20.12/configure.in
--- old/yast2-network-2.20.10/configure.in 2011-01-03 17:08:29.000000000 +0100
+++ new/yast2-network-2.20.12/configure.in 2011-06-22 14:37:33.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.20.10, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.20.12, http://bugs.opensuse.org/, yast2-network)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,9 +18,9 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.20.10"
+VERSION="2.20.12"
RPMNAME="yast2-network"
-MAINTAINER="Michal Zugec "
+MAINTAINER="Martin Vidner "
dnl pkgconfig honors lib64
pkgconfigdir=\${libdir}/pkgconfig
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.20.10/doc/todo.html new/yast2-network-2.20.12/doc/todo.html
--- old/yast2-network-2.20.10/doc/todo.html 2007-08-01 10:49:32.000000000 +0200
+++ new/yast2-network-2.20.12/doc/todo.html 1970-01-01 01:00:00.000000000 +0100
@@ -1,254 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head>
-<title>Network Configuration: Things To Do</title>
-</head><body bgcolor=#ffffff>
-
-<!-- Author: Michal Svec <msvec@suse.cz> -->
-<!-- $Id: skel.html 18222 2004-07-27 09:54:17Z msvec $ -->
-<a name="top"><p>
-<h1>Network Configuration: Things To Do</h1>
-<hr>
-
-<!-- ##BODY## -->
-
-<pre>
-
-# $Id: Todo.txt 18259 2004-07-28 09:54:08Z msvec $
-
-<hr>
-<!--<h2>Bugs </h2>-->
-
-<h2>Bugs:</h2>
-- KInternet: better helptext (configured + kinternet, cinternet)
-- ISDN cleanup (adapt to new sources, better sysconfig) [ISDN]
-
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=35935">#35935</a> nor yast2 asks for internet test although network config skipped
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=37864">#37864</a> nor kinternet not started after dsl config
-
-- name resolving doesn't work without /etc/resolv.conf (ResolveIP, ag_hostnames)
-
-- cleanup ifcfg and hwcfg naming
-- cleanup NetworkModules
-- fix (or delete) all FIXMEs
-
-<h2>in-progress:</h2>
-- [snwint] ifcfg-usb-usb: detected devices (manual adding done, detected missing) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=22739">#22739</a>)
-- [zoz] routing: restart only routing (<a href="http://bugzilla.suse.de/show_bug.cgi?id=33025">#33025</a>)
-
-<hr>
-<!--<h2>Features </h2>-->
-
-<h2>Small Features:</h2>
-- host: add (update) all hosts in the local network
-- host: scan for hosts on the local network [Add]
-- host: show system hosts checkbox (like users have)
-- modem: check existence of the modem device in ModemDialog
-- routing: summary: print other routes in nice form
-- package: include all agents (ag_xauth, ag_resolver, ag_hostnames, ...)
-- routing: DHCLIENT_SET_DEFAULT_ROUTE (similar to RESOLV_CONF, HOSTNAME)
-
-<h2>Large Features:</h2>
-- lan: new UI (<a href="http://bugzilla.suse.de/show_bug.cgi?id=29721">#29721</a>, see also <a href="http://bugzilla.suse.de/show_bug.cgi?id=33801">#33801</a>) [sigi]
-- proxy: use immediately (<a href="http://bugzilla.suse.de/show_bug.cgi?id=23728">#23728</a>), enhance other programs
-- new: IPv6 support (tunnels)
-- lan: check IPv6 support is really functional (all fields)
-- new: cable connection (slip, plip, ppp, usb)
-- hardware: wireless connection (irda, bluetooth) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=35747">#35747</a>)
-- support custom provider from INS file (<a href="http://bugzilla.suse.de/show_bug.cgi?id=25774">#25774</a>)
-- lan: install required packages: dhcpcd|sysconfig|hotplug|wireless-tools (only if needed, before Write?)
-- dialup: don't always ask for the mail config (<a href="http://bugzilla.suse.de/show_bug.cgi?id=31472">#31472</a>)
-- lan: ask for the mail config?
-- lan: allow configuring a net interface without an IP address (<a href="http://bugzilla.suse.de/show_bug.cgi?id=33801">#33801</a>)
-- routing: other fields (see routes(5))
-- modem: speaker volume as combo (or better as slider)
-- not only lan: temporary interface disable (<a href="http://bugzilla.suse.de/show_bug.cgi?id=24926">#24926</a>)
-- lan: myrinet: check for driver presence [warning + info]
-
-<hr>
-<!--<h2>Old Stuff </h2>-->
-
-- lan: netcards without a driver (what to do on s390?, warn?) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=29296">#29296</a>)
-- lan: compiled in kernel drivers (#???)
- offer them besides modularized drivers? src/lan/cards.ycp?
-
-<h2>Improvements:</h2>
-- dns: two resolv.conf scrconfs (resolv.conf.saved.by.dhcpcd, <a href="http://bugzilla.suse.de/show_bug.cgi?id=38834">#38834</a>) XXX?
-- lan: check link presence (see sysconfig.rpm how is it done, or was it RH?)
-- routing: check already present default route (partially <a href="http://bugzilla.suse.de/show_bug.cgi?id=11132">#11132</a>c26)
-- routines: check for yast2-mail presence
-- provider: offer to delete provider after device delete if not used (<a href="http://bugzilla.suse.de/show_bug.cgi?id=16094">#16094</a>)
-- provider: delete default route if removed (<a href="http://bugzilla.suse.de/show_bug.cgi?id=10739">#10739</a>)
-- lan: warn before the network restart (<a href="http://bugzilla.suse.de/show_bug.cgi?id=27137">#27137</a>, <a href="http://bugzilla.suse.de/show_bug.cgi?id=19851">#19851</a>) [WARN]
-- lan: yp configuration failed (<a href="http://bugzilla.suse.de/show_bug.cgi?id=25506">#25506</a>)
- ask if network should be restarted
-- dns: better "DNS and Hostname" and "Hosts" titles (<a href="http://bugzilla.suse.de/show_bug.cgi?id=29722">#29722</a>)
-- dns: better message for broken fields (eg. domain) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=22802">#22802</a>)
-- lan: ssh installation (install.inf format) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=24836">#24836</a>)
- duplicate Alias lines; maybe not necessary, review <a href="http://bugzilla.suse.de/show_bug.cgi?id=22444">#22444</a>
-- dialup: mail question only if new device was added
- yast ui config XXX?
-
-<h2>Enhancements:</h2>
-- detection (netprobe, dhcpcd) <a href="http://bugzilla.suse.de/show_bug.cgi?id=15489">#15489</a> (see also <a href="http://bugzilla.suse.de/show_bug.cgi?id=7287">#7287</a>, <a href="http://bugzilla.suse.de/show_bug.cgi?id=13200">#13200</a>, <a href="http://bugzilla.suse.de/show_bug.cgi?id=9951">#9951</a>)
- <a href="http://bugzilla.suse.de/show_bug.cgi?id=7287">#7287</a>, <a href="http://bugzilla.suse.de/show_bug.cgi?id=13200">#13200</a> are dups of <a href="http://bugzilla.suse.de/show_bug.cgi?id=16471">#16471</a>: take info from linuxrc
-- modem: pap|chap secrets writing (isdn may do it already), not sure if it's useful
-- providers: no-global-values (ini-agent parameter, ease of use: flat(<a href="http://bugzilla.suse.de/show_bug.cgi?id=21867">#21867</a>)?)
-- providers: -> HWDB-NG
-- all: edit without restart (reload)
-- device: use map instead of variables (-> fill all variables)
-- package: require yast2-language, yast2-mail, ... (maybe do that at runtime)
-- feature: IP-masquerading (<a href="http://bugzilla.suse.de/show_bug.cgi?id=16131">#16131</a>), is already in the firewall
-- routing: default route without GW (<a href="http://bugzilla.suse.de/show_bug.cgi?id=23977">#23977</a>)
-- dsl: flat rate (<a href="http://bugzilla.suse.de/show_bug.cgi?id=27840">#27840</a>)
-- improve modules.conf options merging (maybe obsolete with 2.6) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=29995">#29995</a>)
-- make DHCP options iface-local (questionable) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=30476">#30476</a>)
-- edit dsl HW goes through provider again (default provider?) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=24000">#24000</a>)
-- allow to change the netcard type (for a broken detection) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=30890">#30890</a>)
-- skip detect check box (general yast2 feature) (<a href="http://bugzilla.suse.de/show_bug.cgi?id=31478">#31478</a>)
-- installation: better network configuration (inst_netcfg, create_interfaces)
-- host: drop oldhostentry file
-- host: better deleted hostnames handling
-
-<hr>
-<!--<h2>New Bugs </h2>-->
-
-<h2>New in Bugzilla:</h2>
-
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=33071">#33071</a> enh provide a per interface routing configuration
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=33649">#33649</a> cri yast2 ISDN module always activates personal firewall
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=34626">#34626</a> enh Allow giving a net interface an arbitrary name
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=35221">#35221</a> nor LATER Better behavior with multiple dhcp clients
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=35638">#35638</a> min On Abort, ask only if there have been any changes
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=35671">#35671</a> min Yast2 deletes hostname aliases, if more than one are present
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=35955">#35955</a> min LATER Obsolete NETWORK, BROADCAST, NETMASK, UNIQUE in ifcfg
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=37520">#37520</a> enh LATER Let user identify ifcfg by MAC, bus id, vpid...
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=38213">#38213</a> min YaST network forgets configuration name proposal
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=38031">#38031</a> nor Changing network environment causes resolver problems
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=38135">#38135</a> min after deleting the only configured modem, yast2-mail is run
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=38746">#38746</a> nor dsl config is not working with two network cards
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=39027">#39027</a> min LATER "Back" button is interpreted as "Abort"
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=40012">#40012</a> enh LATER Allow editing the whole resolver search list
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=40254">#40254</a> nor LATER Allow choosing the encoding for passwords
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=40458">#40458</a> nor LATER Improve VNC Remote Administration
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=40861">#40861</a> enh LATER Add "Test connection" button to proxy etc. config
-<a href="http://bugzilla.suse.de/show_bug.cgi?id=41204">#41204</a> enh LATER unconnected network card is assumed to be connected
-
-<hr>
-<!--<h2>Documentation </h2>-->
-
-<h2>Documentation:</h2>
-- example dhcpcd-eth0.info
-- example intstall.inf's
-- Net-HOWTO link
-- s390 devices (see bellow, also from mails)
-- overall device overview (see bellow, also required data like IP, RI, NM)
-- UIMODE: link to autodocs
-- doc: adding network device mini-howto: grep for "escon" for example
-- doc: include public_html/network, dia, ...
-
-<h2>New device type:</h2>
-- lan/cards.ycp add type cards (at least one entry)
-- lan/hardware.ycp update "device_types" list
-- modules/NetworkDevices.ycp update "netcard" list
-- routines/complex.ycp add "device_name" to CheckEmptyName
-- routines/hardware.ycp update ControllerType (detection)
-- routines/summary.ycp add "device_type" to DeviceType
-
-<h2>Debug (bugzilla):</h2>
-- 'hwinfo --all --log hwinfo.log'
-- /etc/sysconfig/hardware/hwcfg-*
-- /etc/sysconfig/network/ifcfg-*
-- /etc/sysconfig/network/ifroute-*
-- /var/lib/YaST2/install.inf
-- /var/log/YaST2/y2log*
-
-- /etc/sysconfig/network/providers/* [dialup problems]
-
-- /etc/sysconfig/network/config
-- /etc/sysconfig/network/dhcp
-- /etc/sysconfig/network/routes
-
-- /etc/resolv.conf [DNS problems]
-
-- /etc/modprobe.conf
-- /etc/modprobe.conf.local
-- /etc/modprobe.d/*
-
-- 'ip a'
-- /var/log/messages
-
-<hr>
-<!--<h2>Details for some of the above </h2>-->
-
-<h2>ISDN:</h2>
-- code cleanup (use yast2-network structure: Provider, devices, ...)
-- UI cleanup (http://w3.suse.de/~sigi/yast2/modules/isdn/81isdn/isdn81_improvement_it01.ht...)
-- isdn: start mail after config (<a href="http://bugzilla.suse.de/show_bug.cgi?id=18256">#18256</a>)
-
-<h2>WARN:</h2>
-- <a href="http://bugzilla.suse.de/show_bug.cgi?id=19851">#19851</a>, <a href="http://bugzilla.suse.de/show_bug.cgi?id=27137">#27137</a>
-- warn before rcnetwork restart -> RestartNetwork() || StopNetwork();
-- see routines/runtime.ycp:RunningLocal()
-
-<hr>
-<!--<h2>Ancient Stuff </h2>-->
-
-<h2>TO-SORT:</h2>
-
-- all: use rcnetwork reload (but probably only in some cases, things like
- remove 2 eth cards and add them in a different order won't work due to
- the kernel modules not being unloaded)
- * "rcnetwork reload" (if DeletedModules\!=[] "restart")
-
-- routines: -> FIREWALL=yes|no to each ifcfg-XXX <a href="http://bugzilla.suse.de/show_bug.cgi?id=18840">#18840</a> (support for modems)
-
-<hr>
-<!--<h2>Some details, other stuff, old </h2>-->
-
-<h2>DOC:</h2>
-- doc: dummy: IP/NM/BC
-- doc: irlan: IP/NM/BC (eth?)
-- doc: irnet: IP/RI (?)
-- doc: plip: IP/RI (Parallel Line IP)
-- doc: slip: IP/RI (Serial Line IP, obsoleted by PPP)
-- doc: ppp: IP/RI (Serial Point-To-Point protocol)
-
-<h2>UI proposal:</h2>
-- detected
-- choose your card (current list)
-- hw params only (current manual)
-
-<h2>Hardware:</h2>
-- usb: network cabel, ethernet card, TR card, ISDN card, modem
-- pcmcia: ethernet card, TR card, ISDN card, modem
-- wireless network cards
-- fddi card
-
-- make device optional in routes agent
-- DefaultDevice(ip)
- check all PPP connections (REMOTEIP)
- other devices
- - take IP
- - if(network(IP) == network(ip)) return x;
-- compare with old lan
-- where is this used?
-
-<h2>Modules:</h2>
-- see the "*ISDN*" paper
-
-MODULES=$[]; -> Lan.ycp
-DELETED=[]; -> Lan.ycp
-ReadModules(); -> M
-WriteModules(); <- D,M
-Select: C,M -> global vars
-AddEdit: global vars -> C,M
-Delete: global vars -> C,M,D
-
-<hr>
-<!--<h2>EOF :-) </h2>-->
-
-</pre>
-
-<!-- ##BODY## -->
-
-</body></html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.20.10/src/lan/YaPI/NETWORK.pm new/yast2-network-2.20.12/src/lan/YaPI/NETWORK.pm
--- old/yast2-network-2.20.10/src/lan/YaPI/NETWORK.pm 2010-12-20 15:31:59.000000000 +0100
+++ new/yast2-network-2.20.12/src/lan/YaPI/NETWORK.pm 2011-06-22 14:37:32.000000000 +0200
@@ -4,11 +4,11 @@
use YaST::YCP qw(:LOGGING);
use YaPI;
use Data::Dumper;
-use Switch;
# ------------------- imported modules
YaST::YCP::Import ("LanItems");
YaST::YCP::Import ("Hostname");
+YaST::YCP::Import ("Host");
YaST::YCP::Import ("DNS");
YaST::YCP::Import ("Routing");
# -------------------------------------
@@ -19,43 +19,53 @@
# TODO: parameter map what_I_Need
BEGIN{$TYPEINFO{Read} = ["function",
- [ "map", "string", "any"]];
+ [ "map", "string", "any"]];
}
sub Read {
- my $self = shift;
+ my $self = shift;
-# Hostname->Read();
- DNS->Read();
- Routing->Read();
- LanItems->Read();
-
- my %interfaces = ();
- foreach my $devnum (keys %{LanItems->Items}){
- LanItems->current($devnum);
- if (LanItems->IsItemConfigured()){
- my %configuration = ();
- LanItems->SetItem();
- if (LanItems->isCurrentDHCP()){
- %configuration = ( 'bootproto' => LanItems->bootproto );
- } elsif (LanItems->bootproto eq "static"){
- %configuration = ( 'bootproto' => 'static' );
- $configuration{'ipaddr'} = LanItems->ipaddr . "/" . LanItems->prefix;
- }
- $interfaces{LanItems->interfacename}=\%configuration;
- } elsif (LanItems->getCurrentItem()->{'hwinfo'}->{'type'} eq "eth") {
- my $device = LanItems->getCurrentItem()->{"hwinfo"}->{"dev_name"};
- $interfaces{$device}= {};
+ DNS->Read();
+ Routing->Read();
+ LanItems->Read();
+
+ my %interfaces = ();
+ foreach my $devnum (keys %{LanItems->Items}){
+ LanItems->current($devnum);
+ if (LanItems->IsItemConfigured()){
+ my %configuration = ();
+ LanItems->SetItem();
+ if (LanItems->isCurrentDHCP()){
+ %configuration = ( 'bootproto' => LanItems->bootproto );
+ } elsif (LanItems->bootproto eq "static"){
+ %configuration = ( 'bootproto' => 'static' );
+ $configuration{'ipaddr'} = LanItems->ipaddr . "/" . LanItems->prefix;
+ }
+ $interfaces{LanItems->interfacename}=\%configuration;
+ } elsif (LanItems->getCurrentItem()->{'hwinfo'}->{'type'} eq "eth") {
+ my $device = LanItems->getCurrentItem()->{"hwinfo"}->{"dev_name"};
+ $interfaces{$device}= {};
}
- }
+ }
- #FIXME: validate for nil values (dns espacially)
- my %ret = ('interfaces'=>\%interfaces,
- 'routes'=>{'default'=>{'via'=>Routing->GetGateway()}},
- 'dns'=>{'nameservers'=>\@{DNS->nameservers}, 'searches'=>\@{DNS->searchlist}},
- 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain, 'dhcp_hostname'=>DNS->dhcp_hostname}
-# 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain}
- );
- return \%ret;
+ #FIXME: validate for nil values (dns espacially)
+ my %ret = (
+ 'interfaces' => \%interfaces,
+ 'routes' => {
+ 'default' => {
+ 'via' => Routing->GetGateway()
+ }
+ },
+ 'dns' => {
+ 'nameservers' => \@{DNS->nameservers},
+ 'searches' => \@{DNS->searchlist}
+ },
+ 'hostname' => {
+ 'name' => Hostname->CurrentHostname,
+ 'domain' => Hostname->CurrentDomain,
+ 'dhcp_hostname' => DNS->dhcp_hostname
+ }
+ );
+ return \%ret;
}
sub writeRoute {
@@ -66,121 +76,124 @@
my $dest="";
my @route = ();
if (defined ($args->{'route'}->{'default'}->{'via'})){
- $gw = $args->{'route'}->{'default'}->{'via'};
- if ($gw ne ""){
- YaST::YCP::Import ("IP");
- unless (IP->Check4($gw)) {
- $ret{'exit'} = -1;
- $ret{'error'} = IP->Valid4();
- return \%ret;
- };
- $dest = "default";
- @route = ( {"destination" => $dest,
+ $gw = $args->{'route'}->{'default'}->{'via'};
+ if ($gw ne ""){
+ YaST::YCP::Import ("IP");
+ unless (IP->Check4($gw)) {
+ $ret{'exit'} = -1;
+ $ret{'error'} = IP->Valid4();
+ return \%ret;
+ };
+ $dest = "default";
+ @route = ( {"destination" => $dest,
"gateway" => $gw,
"netmask" => "-",
"device" => "-"
- });
- }
+ });
+ }
}
Routing->Read();
y2milestone("YaPI->Write before change Routes:", Dumper(Routing->Routes));
Routing->Routes( \@route );
y2milestone("YaPI->Write after change Routes:", Dumper(Routing->Routes));
Routing->Write();
- return \%ret;
+ return \%ret;
}
sub writeHostname {
- my $args = shift;
- my $ret = {'exit'=>0, 'error'=>''};
- y2milestone("hostname", Dumper(\$args->{'hostname'}));
- DNS->Read();
- DNS->hostname($args->{'hostname'}->{'name'});
- DNS->domain($args->{'hostname'}->{'domain'});
- DNS->dhcp_hostname($args->{'hostname'}->{'dhcp_hostname'}) if (defined $args->{'hostname'}->{'dhcp_hostname'});
- DNS->modified(1);
- DNS->Write();
- return $ret;
+ my $args = shift;
+ my $ret = {'exit'=>0, 'error'=>''};
+ y2milestone("hostname", Dumper(\$args->{'hostname'}));
+ DNS->Read();
+ DNS->hostname($args->{'hostname'}->{'name'});
+ DNS->domain($args->{'hostname'}->{'domain'});
+ DNS->dhcp_hostname($args->{'hostname'}->{'dhcp_hostname'}) if (defined $args->{'hostname'}->{'dhcp_hostname'});
+ DNS->modified(1);
+ DNS->Write();
+ Host->Read();
+ Host->EnsureHostnameResolvable();
+ Host->Write();
+ return $ret;
}
sub writeDNS {
- my $args = shift;
- my $ret = {'exit'=>0, 'error'=>''};
- y2milestone("dns", Dumper(\$args->{'dns'}));
- DNS->Read();
- DNS->nameservers($args->{'dns'}->{'nameservers'});
- DNS->searchlist($args->{'dns'}->{'searches'});
- DNS->modified(1);
- DNS->Write();
- return $ret;
+ my $args = shift;
+ my $ret = {'exit'=>0, 'error'=>''};
+ y2milestone("dns", Dumper(\$args->{'dns'}));
+ DNS->Read();
+ DNS->nameservers($args->{'dns'}->{'nameservers'});
+ DNS->searchlist($args->{'dns'}->{'searches'});
+ DNS->modified(1);
+ DNS->Write();
+ return $ret;
}
sub writeInterfaces {
- my $args = shift;
- my $ret = {'exit'=>0, 'error'=>''};
- y2milestone("interface", Dumper(\$args->{'interface'}));
- foreach my $dev (keys %{$args->{'interface'}}){
- YaST::YCP::Import ("NetworkInterfaces");
- NetworkInterfaces->Read();
- NetworkInterfaces->Add() unless NetworkInterfaces->Edit($dev);
- NetworkInterfaces->Name($dev);
- my $ip = $args->{'interface'}->{$dev}->{'ipaddr'};
- my $prefix="32";
- YaST::YCP::Import ("Netmask");
- my @ip_row = split(/\//, $ip);
- $prefix = $ip_row[$#ip_row];
- if (Netmask->Check4($prefix) && $prefix =~ /\./){
- y2milestone("Valid netmask: ", $prefix, " will change to prefixlen");
- $prefix = Netmask->ToBits($prefix);
- }
- $ip = $ip_row[0]."/".$prefix;
- my %config=("STARTMODE" => "auto",
- "BOOTPROTO" => $args->{'interface'}->{$dev}->{'bootproto'},
- "IPADDR" => $ip
- );
- NetworkInterfaces->Current(\%config);
- NetworkInterfaces->Commit();
- NetworkInterfaces->Write("");
- YaST::YCP::Import ("Service");
- Service->Restart("network");
- }
- return $ret;
+ my $args = shift;
+ my $ret = {'exit'=>0, 'error'=>''};
+ y2milestone("interface", Dumper(\$args->{'interface'}));
+ foreach my $dev (keys %{$args->{'interface'}}){
+ YaST::YCP::Import ("NetworkInterfaces");
+ NetworkInterfaces->Read();
+ NetworkInterfaces->Add() unless NetworkInterfaces->Edit($dev);
+ NetworkInterfaces->Name($dev);
+ my $ip = $args->{'interface'}->{$dev}->{'ipaddr'};
+ my $prefix="32";
+ YaST::YCP::Import ("Netmask");
+ my @ip_row = split(/\//, $ip);
+ $prefix = $ip_row[$#ip_row];
+ if (Netmask->Check4($prefix) && $prefix =~ /\./){
+ y2milestone("Valid netmask: ", $prefix, " will change to prefixlen");
+ $prefix = Netmask->ToBits($prefix);
+ }
+ $ip = $ip_row[0]."/".$prefix;
+ my %config=("STARTMODE" => "auto",
+ "BOOTPROTO" => $args->{'interface'}->{$dev}->{'bootproto'},
+ "IPADDR" => $ip
+ );
+ NetworkInterfaces->Current(\%config);
+ NetworkInterfaces->Commit();
+ NetworkInterfaces->Write("");
+ YaST::YCP::Import ("Service");
+ Service->Restart("network");
+ }
+ return $ret;
}
BEGIN{$TYPEINFO{Write} = ["function",
- ["map","string","any"],["map","string","any"]];
+ ["map","string","any"],["map","string","any"]];
}
sub Write {
- my $self = shift;
- my $args = shift;
- y2milestone("YaPI->Write with settings:", Dumper(\$args));
-
- # SAVE DEFAULT ROUTE
- if (exists($args->{'route'})){
- my $route_ret = writeRoute($args);
- return $route_ret if ($route_ret->{'exit'} != 0);
- }
- # SAVE HOSTNAME
- if (exists($args->{'hostname'})){
- my $hn_ret = writeHostname($args);
- return $hn_ret if ($hn_ret->{'exit'} != 0);
- }
- # SAVE DNS Settings
- if (exists($args->{'dns'})){
- my $dns_ret = writeDNS($args);
- return $dns_ret if ($dns_ret->{'exit'} != 0);
- }
- # SAVE interfaces Settings
- if (exists($args->{'interface'})){
- my $ifc_ret = writeInterfaces($args);
- return $ifc_ret if ($ifc_ret->{'exit'} != 0);
- }
-
- # return value for exit is type integer, but it'll be converted into string (in yast-perl-bindings)
- # that means in rest-api it'll be {'exit'=>'0', 'error'=>''}
- return {'exit'=>0, 'error'=>''};
+ my $self = shift;
+ my $args = shift;
+ y2milestone("YaPI->Write with settings:", Dumper(\$args));
+
+ # SAVE DEFAULT ROUTE
+ if (exists($args->{'route'})){
+ my $route_ret = writeRoute($args);
+ return $route_ret if ($route_ret->{'exit'} != 0);
+ }
+ # SAVE HOSTNAME
+ if (exists($args->{'hostname'})){
+ my $hn_ret = writeHostname($args);
+ return $hn_ret if ($hn_ret->{'exit'} != 0);
+ }
+ # SAVE DNS Settings
+ if (exists($args->{'dns'})){
+ my $dns_ret = writeDNS($args);
+ return $dns_ret if ($dns_ret->{'exit'} != 0);
+ }
+ # SAVE interfaces Settings
+ if (exists($args->{'interface'})){
+ my $ifc_ret = writeInterfaces($args);
+ return $ifc_ret if ($ifc_ret->{'exit'} != 0);
+ }
+
+ # return value for exit is type integer, but it'll be converted into string (in yast-perl-bindings)
+ # that means in rest-api it'll be {'exit'=>'0', 'error'=>''}
+ return {'exit'=>0, 'error'=>''};
}
1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.20.10/src/modules/DSL.ycp new/yast2-network-2.20.12/src/modules/DSL.ycp
--- old/yast2-network-2.20.10/src/modules/DSL.ycp 2009-04-03 14:42:29.000000000 +0200
+++ new/yast2-network-2.20.12/src/modules/DSL.ycp 2011-06-22 14:37:32.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: DSL data
* Authors: Michal Svec
*
- * $Id: DSL.ycp 56143 2009-03-16 13:50:56Z mzugec $
+ * $Id: DSL.ycp 63424 2011-02-15 14:20:09Z mvidner $
*
* Representation of the configuration of DSL.
* Input and output routines.
@@ -568,7 +568,7 @@
global list<string> Packages() {
if(size(NetworkInterfaces::List("dsl")) < 1) return [];
- return ["smpppd", "ppp", "pptp", "linux-atm-lib"];
+ return ["smpppd", "ppp", "pptp", "libatm1"];
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.20.10/src/modules/Lan.ycp new/yast2-network-2.20.12/src/modules/Lan.ycp
--- old/yast2-network-2.20.10/src/modules/Lan.ycp 2010-12-20 15:31:58.000000000 +0100
+++ new/yast2-network-2.20.12/src/modules/Lan.ycp 2011-06-22 14:37:32.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec
*
- * $Id: Lan.ycp 63004 2010-12-17 09:59:53Z mzugec $
+ * $Id: Lan.ycp 64544 2011-06-22 12:35:44Z mvidner $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -448,6 +448,7 @@
ProgressNextStage(_("Writing routing configuration..."));
boolean orig = Progress::set (false);
Routing::Write();
+ Progress::set (orig);
sleep(sl);
if(Abort()) return false;
@@ -455,6 +456,7 @@
ProgressNextStage(_("Writing hostname and DNS configuration..."));
// write resolv.conf after change from dhcp to static (#327074)
// reload/restart network before this to put correct resolv.conf from dhcp-backup
+ orig = Progress::set (false);
DNS::Write();
Host::EnsureHostnameResolvable();
Host::Write();
@@ -488,7 +490,7 @@
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"));
y2internal("virt_net_proposal %1", virt_net_proposal);
- if (Stage::cont() && virt_net_proposal && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) {
+ if (Stage::cont() && virt_net_proposal == true && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) {
UI::OpenDialog(`opt(`decorated), `HBox(
`HSpacing(1),
`HCenter(`HSquash(`VBox(
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
