Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory
checked in at Mon Sep 21 21:41:46 CEST 2009.
--------
--- yast2-network/yast2-network.changes 2009-09-09 15:12:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2009-09-17 09:54:26.000000000 +0200
@@ -1,0 +2,12 @@
+Wed Sep 16 14:53:15 CEST 2009 - mzugec@suse.cz
+
+- YaPI: write all values (included interfaces)
+- 2.18.47
+
+-------------------------------------------------------------------
+Fri Sep 11 15:31:27 CEST 2009 - mzugec@suse.cz
+
+- YaPI: possible to remove default GW (bnc#538397)
+- 2.18.46
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-network-2.18.45.tar.bz2
New:
----
yast2-network-2.18.47.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.sIGjAK/_old 2009-09-21 21:40:59.000000000 +0200
+++ /var/tmp/diff_new_pack.sIGjAK/_new 2009-09-21 21:40:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.18.45)
+# spec file for package yast2-network (Version 2.18.47)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,10 +19,10 @@
Name: yast2-network
-Version: 2.18.45
+Version: 2.18.47
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.18.45.tar.bz2
+Source0: yast2-network-2.18.47.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPL v2 or later
@@ -65,7 +65,7 @@
This package contains autogenerated documentation for yast2-network
%prep
-%setup -n yast2-network-2.18.45
+%setup -n yast2-network-2.18.47
%build
%{prefix}/bin/y2tool y2autoconf
@@ -131,5 +131,4 @@
%doc %{prefix}/share/doc/packages/yast2-network
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
%exclude %{prefix}/share/doc/packages/yast2-network/README
-
%changelog
++++++ yast2-network-2.18.45.tar.bz2 -> yast2-network-2.18.47.tar.bz2 ++++++
++++ 18947 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.18.45/VERSION new/yast2-network-2.18.47/VERSION
--- old/yast2-network-2.18.45/VERSION 2009-09-07 19:13:18.000000000 +0200
+++ new/yast2-network-2.18.47/VERSION 2009-09-17 09:16:56.000000000 +0200
@@ -1 +1 @@
-2.18.45
+2.18.47
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.18.45/configure.in new/yast2-network-2.18.47/configure.in
--- old/yast2-network-2.18.45/configure.in 2009-09-09 15:10:21.000000000 +0200
+++ new/yast2-network-2.18.47/configure.in 2009-09-17 09:47:15.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-network
dnl
-dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.10 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.18.45, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.18.47, http://bugs.opensuse.org/, yast2-network)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.18.45"
+VERSION="2.18.47"
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.18.45/missing new/yast2-network-2.18.47/missing
--- old/yast2-network-2.18.45/missing 2009-09-09 15:10:37.000000000 +0200
+++ new/yast2-network-2.18.47/missing 2009-09-17 09:47:18.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
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.18.45/src/lan/YaPI/NETWORK.pm new/yast2-network-2.18.47/src/lan/YaPI/NETWORK.pm
--- old/yast2-network-2.18.45/src/lan/YaPI/NETWORK.pm 2009-09-04 19:07:32.000000000 +0200
+++ new/yast2-network-2.18.47/src/lan/YaPI/NETWORK.pm 2009-09-17 09:16:55.000000000 +0200
@@ -8,6 +8,7 @@
# ------------------- imported modules
YaST::YCP::Import ("LanItems");
+YaST::YCP::Import ("Hostname");
YaST::YCP::Import ("DNS");
YaST::YCP::Import ("Routing");
# -------------------------------------
@@ -23,6 +24,7 @@
sub Read {
my $self = shift;
+# Hostname->Read();
DNS->Read();
Routing->Read();
LanItems->Read();
@@ -40,43 +42,96 @@
%configuration->{'ipaddr'} = LanItems->ipaddr . "/" . LanItems->prefix;
}
$interfaces{LanItems->interfacename}=\%configuration;
- }
+ } elsif (LanItems->getCurrentItem()->{'hwinfo'}->{'type'} eq "eth") {
+ $interfaces{%{LanItems->getCurrentItem()}->{"hwinfo"}->{"dev_name"}}= {};
+ }
}
+ #FIXME: validate for nil values (dns espacially)
my %ret = ('interfaces'=>\%interfaces,
'routes'=>{'default'=>{'via'=>Routing->GetGateway()}},
- 'dns'=>{'dnsservers'=>\@{DNS->nameservers}, 'dnsdomains'=>\@{DNS->searchlist}},
- 'hostname'=>{'name'=>DNS->hostname, 'domain'=>DNS->domain}
+ 'dns'=>{'nameservers'=>\@{DNS->nameservers}, 'searches'=>\@{DNS->searchlist}},
+ 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain}
);
-
return \%ret;
}
-#BEGIN{$TYPEINFO{Get} = ["function",
-# [ "map", "string", "any"],
-# "string" ];
-#}
-#sub Get {
-#
-# my $self = shift;
-# my $name = shift;
-#
-# my $service = {
-# "name" => $name,
-# "status" => Service->Status ($name)
-# };
-# return $service;
-#}
-
-BEGIN{$TYPEINFO{Execute} = ["function",
- [ "map", "string", "any"],
- "string", "string" ];
+BEGIN{$TYPEINFO{Write} = ["function",
+ "boolean",["map","string","any"]];
}
-sub Execute {
+sub Write {
+ my $self = shift;
+ my $args = shift;
+ y2milestone("YaPI->Write with settings:", Dumper(\$args));
+ # SAVE DEFAULT ROUTE
+ if (exists($args->{'route'})){
+ my $gw="";
+ my $dest="";
+ my @route = ();
+ if (defined ($args->{'route'}->{'default'}->{'via'})){
+ $gw = $args->{'route'}->{'default'}->{'via'};
+ if ($gw ne ""){
+ $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();
+ }
+ # SAVE HOSTNAME
+ if (exists($args->{'hostname'})){
+ y2milestone("hostname", Dumper(\$args->{'hostname'}));
+ DNS->Read();
+ DNS->hostname($args->{'hostname'}->{'name'});
+ DNS->domain($args->{'hostname'}->{'domain'});
+ DNS->modified(1);
+ DNS->Write();
+ }
+ # SAVE DNS Settings
+ if (exists($args->{'dns'})){
+ y2milestone("dns", Dumper(\$args->{'dns'}));
+ DNS->Read();
+ DNS->nameservers($args->{'dns'}->{'nameservers'});
+ DNS->searchlist($args->{'dns'}->{'searches'});
+ DNS->modified(1);
+ DNS->Write();
+ }
+ # SAVE DNS Settings
+ if (exists($args->{'interface'})){
+ y2milestone("interface", Dumper(\$args->{'interface'}));
+ foreach my $dev (keys %{$args->{'interface'}}){
+# YaST::YCP::Import ("LanItems");
+# LanItems->Read();
+# foreach my $iface (keys %{LanItems->Items}){
+# LanItems->current($iface);
+# LanItems->DeleteItem();
+# }
+# LanItems->Write();
+ YaST::YCP::Import ("NetworkInterfaces");
+ NetworkInterfaces->Read();
+ NetworkInterfaces->Add() if NetworkInterfaces->Edit($dev) ne 1;
+ NetworkInterfaces->Name($dev);
+ my %config=("STARTMODE" => "onboot",
+ "BOOTPROTO" => $args->{'interface'}->{$dev}->{'bootproto'},
+ "IPADDR" => $args->{'interface'}->{$dev}->{'ipaddr'}
+ );
+ NetworkInterfaces->Current(\%config);
+ NetworkInterfaces->Commit();
+ NetworkInterfaces->Write("");
+ YaST::YCP::Import ("Service");
+ Service->Restart("network");
+ }
- my $self = shift;
- my $name = shift;
- my $action = shift;
- return Service->RunInitScriptOutput ($name, $action);
+ }
+
+ return 1;
}
+
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.18.45/testsuite/tests/Network_YaPI.out new/yast2-network-2.18.47/testsuite/tests/Network_YaPI.out
--- old/yast2-network-2.18.45/testsuite/tests/Network_YaPI.out 2009-09-04 19:07:32.000000000 +0200
+++ new/yast2-network-2.18.47/testsuite/tests/Network_YaPI.out 2009-09-17 09:46:20.000000000 +0200
@@ -37,4 +37,6 @@
Read .target.lstat "/etc/sysconfig/network/ifcfg-eth-usb" nil
Read .target.lstat "/etc/sysconfig/network/ifcfg-tr-pcmcia" nil
Read .target.lstat "/etc/sysconfig/network/ifcfg-tr-usb" nil
-Return $["dns":$["dnsdomains":["suse.cz", "suse.de"], "dnsservers":["208.67.222.222", "208.67.220.220"]], "hostname":$["domain":"suse.cz", "name":"laptop"], "interfaces":$["eth0":$["bootproto":"dhcp4"], "eth1":$["bootproto":"static", "ipaddr":"1.2.3.4/24"]], "routes":$["default":$["via":"10.20.30.40"]]]
+Execute .target.bash_output "hostname --fqdn" $["exit":0, "stdout":"laptop.suse.cz"]
+Execute .target.bash_output "hostname --fqdn" $["exit":0, "stdout":"laptop.suse.cz"]
+Return $["dns":$["nameservers":["208.67.222.222", "208.67.220.220"], "searches":["suse.cz", "suse.de"]], "hostname":$["domain":"suse.cz", "name":"laptop"], "interfaces":$["eth0":$["bootproto":"dhcp4"], "eth1":$["bootproto":"static", "ipaddr":"1.2.3.4/24"]], "routes":$["default":$["via":"10.20.30.40"]]]
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.18.45/testsuite/tests/Network_YaPI.ycp new/yast2-network-2.18.47/testsuite/tests/Network_YaPI.ycp
--- old/yast2-network-2.18.45/testsuite/tests/Network_YaPI.ycp 2009-09-04 19:07:32.000000000 +0200
+++ new/yast2-network-2.18.47/testsuite/tests/Network_YaPI.ycp 2009-09-17 09:45:41.000000000 +0200
@@ -5,7 +5,8 @@
map READ = $[
"target" : $[
"size":27,
- "string" : "laptop.suse.cz"
+ "string" : "laptop.suse.cz",
+ "bash_output" : "laptop.suse.cz"
],
"sysconfig": $[
"network" : $[
@@ -29,6 +30,14 @@
"routes" : [ $["destination":"default", "gateway":"10.20.30.40"] ]
];
-TEST(``(YaPI::NETWORK::Read()), [READ], nil);
+map EXEC = $[
+ "target" : $[
+ "bash_output" : $[
+ "exit" : 0,
+ "stdout" : "laptop.suse.cz"
+ ]
+ ]
+ ];
+TEST(``(YaPI::NETWORK::Read()), [READ, $[], EXEC], nil);
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org