Hello community,
here is the log from the commit of package yast2-network
checked in at Fri Jun 15 11:51:20 CEST 2007.
--------
--- yast2-network/yast2-network.changes 2007-06-11 17:47:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-06-15 11:23:24.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Jun 15 10:52:42 CEST 2007 - mzugec@suse.cz
+
+- don't write resolv.conf and route for dhcp (#284599)
+- read vendor+device from sysfs instead of NAME
+- 2.15.45
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.15.44.tar.bz2
New:
----
yast2-network-2.15.45.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.m18262/_old 2007-06-15 11:51:05.000000000 +0200
+++ /var/tmp/diff_new_pack.m18262/_new 2007-06-15 11:51:05.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.15.44)
+# spec file for package yast2-network (Version 2.15.45)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-network
-Version: 2.15.44
+Version: 2.15.45
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.15.44.tar.bz2
+Source0: yast2-network-2.15.45.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -53,7 +53,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.15.44
+%setup -n yast2-network-2.15.45
%build
%{prefix}/bin/y2tool y2autoconf
@@ -109,6 +109,10 @@
/usr/share/YaST2/schema/autoyast/rnc/proxy.rnc
%changelog
+* Fri Jun 15 2007 - mzugec@suse.cz
+- don't write resolv.conf and route for dhcp (#284599)
+- read vendor+device from sysfs instead of NAME
+- 2.15.45
* Mon Jun 11 2007 - mzugec@suse.cz
- don't write hwcfg when not needed
- 2.15.44
++++++ yast2-network-2.15.44.tar.bz2 -> yast2-network-2.15.45.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.44/configure new/yast2-network-2.15.45/configure
--- old/yast2-network-2.15.44/configure 2007-06-11 17:44:17.000000000 +0200
+++ new/yast2-network-2.15.45/configure 2007-06-15 10:46:13.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-network 2.15.43.
+# Generated by GNU Autoconf 2.60 for yast2-network 2.15.44.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.15.43'
-PACKAGE_STRING='yast2-network 2.15.43'
+PACKAGE_VERSION='2.15.44'
+PACKAGE_STRING='yast2-network 2.15.44'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-network 2.15.43 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.15.44 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-network 2.15.43:";;
+ short | recursive ) echo "Configuration of yast2-network 2.15.44:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.15.43
+yast2-network configure 2.15.44
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-network $as_me 2.15.43, which was
+It was created by yast2-network $as_me 2.15.44, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-network'
- VERSION='2.15.43'
+ VERSION='2.15.44'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.43"
+VERSION="2.15.44"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
@@ -3258,7 +3258,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-network $as_me 2.15.43, which was
+This file was extended by yast2-network $as_me 2.15.44, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3301,7 +3301,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-network config.status 2.15.43
+yast2-network config.status 2.15.44
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.44/configure.in new/yast2-network-2.15.45/configure.in
--- old/yast2-network-2.15.44/configure.in 2007-06-11 17:44:12.000000000 +0200
+++ new/yast2-network-2.15.45/configure.in 2007-06-15 10:46:08.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.15.43, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.15.44, http://bugs.opensuse.org/, yast2-network)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.43"
+VERSION="2.15.44"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.44/src/clients/save_network.ycp new/yast2-network-2.15.45/src/clients/save_network.ycp
--- old/yast2-network-2.15.44/src/clients/save_network.ycp 2007-06-11 16:50:24.000000000 +0200
+++ new/yast2-network-2.15.45/src/clients/save_network.ycp 2007-06-15 10:54:44.000000000 +0200
@@ -191,7 +191,6 @@
string CreateHardwareFile(){
string hwfile="";
- boolean need=false;
map hw=$[];
// read current hardware information and check if configuration file exists
hwcfg=getcfg("-f hwcfg- -d /etc/sysconfig/hardware", InstallInf["netdevice"]:"");
@@ -231,22 +230,21 @@
y2error("Not connected to bus! Using %1", hwfile);
}
string content=sformat("STARTMODE='auto'\nMODULE='%1'\nMODULE_OPTIONS='%2'\n", InstallInf["module"]:"", InstallInf["options"]:"");
- if (need) {
+ if (needHwcfg(hw)) {
y2internal ("creating %1 file\n%2", hwfile, content);
SCR::Write(.target.string, getHWFullPath(hwfile), content);
}
- else y2warning("no hwcfg needed");
+ else {
+ y2warning("no hwcfg needed");
+ hwfile = "";
+ }
}else {
// in case of s390 hwcfg is created by Linuxrc (uli)
y2warning("hwcfg already exists");
hwfile = hwcfg[sformat("HWD_CONFIG_%1", tointeger(hwcfg["HWD_CONFIG_N"]:"0")-1)]:"";
y2internal("configuration name = %1", hwfile);
}
- if (!need){
- y2warning("no needed to create hwcfg file");
- hwfile="";
- } else
- y2internal("Hardware file: %1", getHWFullPath(hwfile));
+ y2internal("Hardware file: %1", getHWFullPath(hwfile));
return hwfile;
}
@@ -334,11 +332,6 @@
*/
void CreateOtherNetworkFiles(){
- // create routes file
- if (size(InstallInf["gateway"]:"")>0){
- y2milestone("Writing route : %1", InstallInf["gateway"]:"");
- SCR::Write(.target.string, "/etc/sysconfig/network/routes", InstallInf["gateway"]:"");
- } else y2warning("No routing information in install.inf");
// create hostname
if (size(InstallInf["hostname"]:"")>0){
@@ -346,14 +339,22 @@
SCR::Write(.target.string, "/etc/HOSTNAME", InstallInf["hostname"]:"");
}
- // create resolv.conf
- if (size(InstallInf["domain"]:"")>0 && size(InstallInf["nameserver"]:"")>0){
- string text=sformat("domain %1
+ if(InstallInf["bootproto"]:"dhcp"=="static")
+ {
+ // create routes file
+ if (size(InstallInf["gateway"]:"")>0){
+ y2milestone("Writing route : %1", InstallInf["gateway"]:"");
+ SCR::Write(.target.string, "/etc/sysconfig/network/routes", InstallInf["gateway"]:"");
+ } else y2warning("No routing information in install.inf");
+
+ // create resolv.conf only for static configuration
+ if (size(InstallInf["domain"]:"")>0 && size(InstallInf["nameserver"]:"")>0){
+ string text=sformat("domain %1
nameserver %2", InstallInf["domain"]:"", InstallInf["nameserver"]:"");
- y2milestone("Write resolv.conf content: %1", text);
- SCR::Write(.target.string, "/etc/resolv.conf", text);
+ y2milestone("Write resolv.conf content: %1", text);
+ SCR::Write(.target.string, "/etc/resolv.conf", text);
+ }
}
-
// create defaultdomain
if (size(InstallInf["domain"]:"")>0 && FileUtils::Exists("/etc/defaultdomain")){
y2milestone("Write defaultdomain: %1", InstallInf["domain"]:"");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.44/src/routines/widgets.ycp new/yast2-network-2.15.45/src/routines/widgets.ycp
--- old/yast2-network-2.15.44/src/routines/widgets.ycp 2007-06-06 16:35:20.000000000 +0200
+++ new/yast2-network-2.15.45/src/routines/widgets.ycp 2007-06-15 11:22:57.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Widgets for CWM
* Authors: Martin Vidner
*
- * $Id: widgets.ycp 38321 2007-06-06 14:35:16Z mzugec $
+ * $Id: widgets.ycp 38482 2007-06-15 09:22:51Z mzugec $
*/
{
@@ -184,7 +184,17 @@
define string GetDeviceDescription(string device_id) {
- string device_name = NetworkDevices::GetValue(device_id,"NAME");
+ // get sysfs patch for device
+ string sysfs = ((map)SCR::Execute(.target.bash_output, sformat("getcfg %1|grep '^HWD_DEVICEPATH' |cut -d '\"' -f2|tr -d '\\n'", device_id)))["stdout"]:"";
+ // get vendorID, deviceID from sysfs path
+ string vendor = deletechars((string) SCR::Read(.target.string, sformat("%1/vendor", sysfs)), "\n");
+ string device = deletechars((string) SCR::Read(.target.string, sformat("%1/device", sysfs)), "\n");
+ vendor=splitstring(vendor, "x")[1]:"";
+ device=splitstring(device, "x")[1]:"";
+ // get device name from vendorID, deviceID
+ string device_name = ((map) SCR::Execute(.target.bash_output, sformat("echo $(grep -i '%1 ' /usr/share/pci.ids |cut -d' ' -f3-) $(grep -i '%1 %2' /usr/share/pci.ids |cut -d ' ' -f4-)|tr -d '\\n'", vendor, device)))["stdout"]:"";
+y2internal("device_name %1", device_name);
+// string device_name = NetworkDevices::GetValue(device_id,"NAME");
if ( (device_name == nil) || (device_name == "") ) {
//TRANSLATORS: Informs that device name is not known
device_name = _("Unknown device");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.44/VERSION new/yast2-network-2.15.45/VERSION
--- old/yast2-network-2.15.44/VERSION 2007-06-11 17:45:24.000000000 +0200
+++ new/yast2-network-2.15.45/VERSION 2007-06-15 10:51:55.000000000 +0200
@@ -1 +1 @@
-2.15.44
+2.15.45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org