Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory
checked in at Fri Mar 12 01:47:30 CET 2010.
--------
--- yast2-network/yast2-network.changes 2010-03-02 10:02:31.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2010-03-11 10:31:26.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Mar 11 10:29:11 CET 2010 - mzugec@suse.cz
+
+- L3: update device name via which is system installed by AY
+(bnc#578760)
+- 2.19.14
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-network-2.19.13.tar.bz2
New:
----
yast2-network-2.19.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.jgqNYU/_old 2010-03-12 01:47:20.000000000 +0100
+++ /var/tmp/diff_new_pack.jgqNYU/_new 2010-03-12 01:47:20.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.19.13)
+# spec file for package yast2-network (Version 2.19.14)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2-network
-Version: 2.19.13
+Version: 2.19.14
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.19.13.tar.bz2
+Source0: yast2-network-2.19.14.tar.bz2
Prefix: /usr
@@ -73,7 +73,7 @@
This package contains autogenerated documentation for yast2-network
%prep
-%setup -n yast2-network-2.19.13
+%setup -n yast2-network-2.19.14
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-network-2.19.13.tar.bz2 -> yast2-network-2.19.14.tar.bz2 ++++++
++++ 13724 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.19.13/VERSION new/yast2-network-2.19.14/VERSION
--- old/yast2-network-2.19.13/VERSION 2010-03-02 09:57:04.000000000 +0100
+++ new/yast2-network-2.19.14/VERSION 2010-03-11 10:29:02.000000000 +0100
@@ -1 +1 @@
-2.19.13
+2.19.14
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.19.13/src/clients/save_network.ycp new/yast2-network-2.19.14/src/clients/save_network.ycp
--- old/yast2-network-2.19.13/src/clients/save_network.ycp 2010-03-02 09:54:26.000000000 +0100
+++ new/yast2-network-2.19.14/src/clients/save_network.ycp 2010-03-11 10:28:17.000000000 +0100
@@ -32,6 +32,7 @@
// global variable because chrooted environment
integer network_disk=0;
+string netdevice="";
/**
* Read one install.inf item
@@ -116,6 +117,13 @@
/* Split network device */
string netdevice = InstallInf["netdevice"]:"";
+ if (Mode::autoinst()){
+ string new_devname = LanUdevAuto::GetDevnameByMAC(InstallInf["hwaddr"]:"");
+ if (size(new_devname)>0){
+ y2internal("old devname: %1, new devname: %2", netdevice, new_devname);
+ netdevice=new_devname;
+ }
+ }
if(netdevice != "") {
string devtype = NetworkInterfaces::device_type(netdevice);
if(devtype != nil && devtype != "") InstallInf["type"] = devtype;
@@ -307,9 +315,9 @@
if (size(InstallInf["remote_ip"]:"")>0)
network_configuration = sformat("%1REMOTE_IPADDR='%2'\n", network_configuration, InstallInf["remote_ip"]:"");
- string ifcfg = sformat("ifcfg-%1", InstallInf["netdevice"]:"");
+ string ifcfg = sformat("ifcfg-%1", netdevice);
- string hw_name = BuildDescription(NetworkInterfaces::device_type(InstallInf["netdevice"]:""), NetworkInterfaces::device_num(ifcfg), $["dev_name":InstallInf["netdevice"]:""], hardware);
+ string hw_name = BuildDescription(NetworkInterfaces::device_type(netdevice), NetworkInterfaces::device_num(ifcfg), $["dev_name":netdevice], hardware);
// protect special characters, #305343
if (size(hw_name)>0)
network_configuration = sformat("%1NAME='%2'\n", network_configuration, String::Quote (hw_name));
@@ -320,13 +328,8 @@
string dev_file=sformat("/etc/sysconfig/network/%1", ifcfg);
// string dev_file=sformat("/tmp/%1", ifcfg);
-// 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);
}
/*
@@ -518,7 +521,7 @@
y2milestone("%1 does not exist yet, creating it", udev_rules_destdir);
WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", udev_rules_destdir));
} else
- y2internal("file %1 exists", udev_rules_destdir);
+ y2milestone("File %1 exists", udev_rules_destdir);
if (! FileUtils::Exists( net_destfile ))
{
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.19.13/src/modules/LanUdevAuto.ycp new/yast2-network-2.19.14/src/modules/LanUdevAuto.ycp
--- old/yast2-network-2.19.13/src/modules/LanUdevAuto.ycp 2008-10-23 18:08:37.000000000 +0200
+++ new/yast2-network-2.19.14/src/modules/LanUdevAuto.ycp 2010-03-11 10:27:15.000000000 +0100
@@ -200,14 +200,6 @@
}
});
} else{
-/*
- list<map> all_devices=[];
-y2internal("export devices %1", devices);
- foreach(string key, (list<string>)Map::Keys(devices), {
- all_devices=add(all_devices, devices[key]:$[]);
- });
- y2internal("export rules %1", createUdevFromIfaceName(all_devices));
-*/
foreach(integer id, map