Hello community, here is the log from the commit of package hwinfo checked in at Mon Sep 29 17:40:28 CEST 2008. -------- --- hwinfo/hwinfo.changes 2008-09-25 15:01:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/hwinfo/hwinfo.changes 2008-09-26 17:53:57.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Sep 26 17:53:52 CEST 2008 - snwint@suse.de + +- dump network card eeprom to log (bnc #430170) + +------------------------------------------------------------------- Old: ---- hwinfo-15.6.tar.bz2 New: ---- hwinfo-15.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.H16868/_old 2008-09-29 17:39:53.000000000 +0200 +++ /var/tmp/diff_new_pack.H16868/_new 2008-09-29 17:39:53.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package hwinfo (Version 15.6) +# spec file for package hwinfo (Version 15.7) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,9 +28,9 @@ PreReq: /sbin/ldconfig %insserv_prereq %fillup_prereq AutoReqProv: on Summary: Hardware Library -Version: 15.6 +Version: 15.7 Release: 1 -Source: hwinfo-15.6.tar.bz2 +Source: hwinfo-15.7.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -102,6 +102,8 @@ %doc doc/libhd/html %changelog +* Fri Sep 26 2008 snwint@suse.de +- dump network card eeprom to log (bnc #430170) * Thu Sep 25 2008 uli@suse.de - s390: dual port OSA Express devices are not detectable; fixing dualport flag to 1 (fate #304080) ++++++ hwinfo-15.6.tar.bz2 -> hwinfo-15.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.6/Changelog new/hwinfo-15.7/Changelog --- old/hwinfo-15.6/Changelog 2008-09-25 15:00:34.000000000 +0200 +++ new/hwinfo-15.7/Changelog 2008-09-26 17:53:42.000000000 +0200 @@ -1,4 +1,7 @@ -25/9/2008: v15.6 +26/9/2008: v15.7 + - dump network card eeprom to log (bnc #430170) + +26/9/2008: v15.6 - s390: dual port OSA Express devices are not detectable; fixing dualport flag to 1 (fate #304080) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.6/src/hd/hd.c new/hwinfo-15.7/src/hd/hd.c --- old/hwinfo-15.6/src/hd/hd.c 2008-09-15 14:25:24.000000000 +0200 +++ new/hwinfo-15.7/src/hd/hd.c 2008-09-26 17:31:43.000000000 +0200 @@ -259,6 +259,7 @@ { pr_isapnp_mod, 0, 4 , "isapnp.mod" }, { pr_isapnp, 0, 0, "pnpdump" }, /* alias for isapnp */ { pr_net, 0, 8|4|2|1, "net" }, + { pr_net_eeprom, 0, 0, "net.eeprom" }, { pr_floppy, 0, 8|4|2|1, "floppy" }, { pr_misc, pr_bios, 8|4|2|1, "misc" }, // ugly hack! { pr_misc_serial, pr_misc, 8|4|2|1, "misc.serial" }, @@ -1812,6 +1813,7 @@ if(hd_probe_feature(hd_data, pr_bios_vram)) hd_data->flags.biosvram = 1; hd_set_probe_feature(hd_data, pr_bios_acpi); hd_set_probe_feature(hd_data, pr_modules_pata); + hd_set_probe_feature(hd_data, pr_net_eeprom); hd_data->flags.pata = hd_probe_feature(hd_data, pr_modules_pata) ? 1 : 0; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.6/src/hd/hd.h new/hwinfo-15.7/src/hd/hd.h --- old/hwinfo-15.6/src/hd/hd.h 2008-09-25 13:52:53.000000000 +0200 +++ new/hwinfo-15.7/src/hd/hd.h 2008-09-26 17:35:50.000000000 +0200 @@ -118,7 +118,7 @@ pr_bios_fb, pr_bios_mode, pr_input, pr_block_mods, pr_bios_vesa, pr_cpuemu_debug, pr_scsi_noserial, pr_wlan, pr_bios_crc, pr_hal, pr_bios_vram, pr_bios_acpi, pr_bios_ddc_ports_1, pr_bios_ddc_ports_2, - pr_bios_ddc_ports_3, pr_bios_ddc_ports_4, pr_modules_pata, + pr_bios_ddc_ports_3, pr_bios_ddc_ports_4, pr_modules_pata, pr_net_eeprom, pr_max, pr_lxrc, pr_default, pr_all /**< pr_all must be last */ } hd_probe_feature_t; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.6/src/hd/net.c new/hwinfo-15.7/src/hd/net.c --- old/hwinfo-15.6/src/hd/net.c 2008-09-11 15:11:51.000000000 +0200 +++ new/hwinfo-15.7/src/hd/net.c 2008-09-26 17:49:52.000000000 +0200 @@ -354,12 +354,30 @@ add_uml(hd_data); add_kma(hd_data); - /* add link status info */ + /* add link status info & dump eeprom */ for(hd = hd_data->hd ; hd; hd = hd->next) { if( hd->module == hd_data->module && hd->base_class.id == bc_network_interface ) { + char *buf = NULL; + str_list_t *sl0, *sl; + + if(hd_probe_feature(hd_data, pr_net_eeprom) && hd->unix_dev_name) { + PROGRESS(2, 0, "eeprom dump"); + + str_printf(&buf, 0, "|/usr/sbin/ethtool -e %s 2>/dev/null", hd->unix_dev_name); + if((sl0 = read_file(buf, 0, 0))) { + ADD2LOG("----- %s %s -----\n", hd->unix_dev_name, "EEPROM dump"); + for(sl = sl0; sl; sl = sl->next) { + ADD2LOG("%s", sl->str); + } + ADD2LOG("----- %s end -----\n", "EEPROM dump"); + free_str_list(sl0); + } + free(buf); + } + for(res = hd->res; res; res = res->next) { if(res->any.type == res_link) break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.6/src/hd/s390.c new/hwinfo-15.7/src/hd/s390.c --- old/hwinfo-15.6/src/hd/s390.c 2008-09-25 13:52:21.000000000 +0200 +++ new/hwinfo-15.7/src/hd/s390.c 2007-08-10 15:55:38.000000000 +0200 @@ -218,11 +218,6 @@ hd->detail->ccw.data->cu_model=cumod; hd->detail->ccw.data->dev_model=devmod; hd->detail->ccw.data->lcss=(strtol(curdev->d_name,0,16) << 8) + strtol(curdev->d_name+2,0,16); - - /* OSA Express devices with more than one port are not detectable, so we - have to set dualport for all OSA Express network interfaces */ - if(cutype == 0x1731 && cumod == 1) hd->is.dualport = 1; - hddb_add_info(hd_data,hd); } closedir(bus); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.6/VERSION new/hwinfo-15.7/VERSION --- old/hwinfo-15.6/VERSION 2008-09-25 15:00:37.000000000 +0200 +++ new/hwinfo-15.7/VERSION 2008-09-26 17:53:09.000000000 +0200 @@ -1 +1 @@ -15.6 +15.7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org