Hello community, here is the log from the commit of package linuxrc checked in at Mon Feb 5 15:40:19 CET 2007. -------- --- linuxrc/linuxrc.changes 2007-01-26 15:06:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2007-02-05 13:06:42.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 5 13:06:39 CET 2007 - snwint@suse.de + +- read iSCSI BIOS tables (#221206) + +------------------------------------------------------------------- Old: ---- linuxrc-2.1.19.tar.bz2 New: ---- linuxrc-2.1.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.A17310/_old 2007-02-05 15:40:07.000000000 +0100 +++ /var/tmp/diff_new_pack.A17310/_new 2007-02-05 15:40:07.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 2.1.19) +# spec file for package linuxrc (Version 2.1.20) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,9 +16,9 @@ Group: System/Boot Autoreqprov: on Summary: SUSE Installation Program -Version: 2.1.19 +Version: 2.1.20 Release: 1 -Source: linuxrc-2.1.19.tar.bz2 +Source: linuxrc-2.1.20.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,6 +53,8 @@ %doc linuxrc.html %changelog -n linuxrc +* Mon Feb 05 2007 - snwint@suse.de +- read iSCSI BIOS tables (#221206) * Fri Jan 26 2007 - snwint@suse.de - add network card name to install.inf (#223498) * Fri Jan 19 2007 - snwint@suse.de ++++++ linuxrc-2.1.19.tar.bz2 -> linuxrc-2.1.20.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.19/Changelog new/linuxrc-2.1.20/Changelog --- old/linuxrc-2.1.19/Changelog 2007-01-26 14:13:22.000000000 +0100 +++ new/linuxrc-2.1.20/Changelog 2007-02-02 15:18:04.000000000 +0100 @@ -1,3 +1,6 @@ +2/2/2007: v2.1.20 + - read iSCSI BIOS tables (#221206) + 26/1/2007: v2.1.19 - add network card name to install.inf (#223498) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.19/file.c new/linuxrc-2.1.20/file.c --- old/linuxrc-2.1.19/file.c 2007-01-26 13:05:14.000000000 +0100 +++ new/linuxrc-2.1.20/file.c 2007-02-02 15:14:40.000000000 +0100 @@ -269,7 +269,12 @@ { key_wlan_key_hex, "WlanKeyHex", kf_cfg + kf_cmd }, { key_wlan_key_pass, "WlanKeyPass", kf_cfg + kf_cmd }, { key_wlan_key_len, "WlanKeyLen", kf_cfg + kf_cmd }, - { key_netcardname, "NetCardName", kf_none } + { key_netcardname, "NetCardName", kf_none }, + { key_ibft_hwaddr, "iSCSI_INITIATOR_HWADDR", kf_ibft }, + { key_ibft_ipaddr, "iSCSI_INITIATOR_IPADDR", kf_ibft }, + { key_ibft_netmask, "iSCSI_INITIATOR_NETMASK", kf_ibft }, + { key_ibft_gateway, "iSCSI_INITIATOR_GATEWAY", kf_ibft }, + { key_ibft_dns, "iSCSI_INITIATOR_DNSADDR1", kf_ibft } }; static struct { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.19/file.h new/linuxrc-2.1.20/file.h --- old/linuxrc-2.1.19/file.h 2007-01-26 13:04:56.000000000 +0100 +++ new/linuxrc-2.1.20/file.h 2007-02-02 15:16:57.000000000 +0100 @@ -46,7 +46,9 @@ key_osamedium, key_osainterface, key_dud_complain, key_dud_expected, key_staticdevices, key_withiscsi, key_ethtool, key_listen, key_zombies, key_dhcpcd, key_layer2, key_wlan_essid, key_wlan_auth, key_wlan_key_ascii, - key_wlan_key_hex, key_wlan_key_pass, key_wlan_key_len, key_netcardname + key_wlan_key_hex, key_wlan_key_pass, key_wlan_key_len, key_netcardname, + key_ibft_hwaddr, key_ibft_ipaddr, key_ibft_netmask, key_ibft_gateway, + key_ibft_dns } file_key_t; typedef enum { @@ -58,7 +60,8 @@ kf_dhcp = 1 << 4, /* dhcp info file */ kf_mem = 1 << 5, /* /proc/meminfo */ kf_boot = 1 << 6, /* things the boot loader used */ - kf_cmd1 = 1 << 7 /* between cmd_early and start of hw detection */ + kf_cmd1 = 1 << 7, /* between cmd_early and start of hw detection */ + kf_ibft = 1 << 8 /* ibft values (iSCSI BIOS) */ } file_key_flag_t; typedef struct file_s { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.19/linuxrc.c new/linuxrc-2.1.20/linuxrc.c --- old/linuxrc-2.1.19/linuxrc.c 2006-10-24 16:51:00.000000000 +0200 +++ new/linuxrc-2.1.20/linuxrc.c 2007-02-02 15:02:40.000000000 +0100 @@ -913,6 +913,8 @@ info_init(); + read_iscsi_ibft(); + printf("Loading basic drivers..."); fflush(stdout); mod_init(1); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.19/util.c new/linuxrc-2.1.20/util.c --- old/linuxrc-2.1.19/util.c 2007-01-26 12:52:42.000000000 +0100 +++ new/linuxrc-2.1.20/util.c 2007-02-05 13:01:36.000000000 +0100 @@ -4943,3 +4943,58 @@ } +void read_iscsi_ibft() +{ + file_t *f0, *f; + + if(!util_check_exist("/sbin/fwparam_ibft")) return; + + system("/sbin/fwparam_ibft -b >/var/log/ibft"); + + f0 = file_read_file("/var/log/ibft", kf_ibft); + + if(config.debug) { + if(f0) { + fprintf(stderr, "ibft values:\n"); + for(f = f0; f; f = f->next) { + fprintf(stderr, " %s=%s\n", f->key_str, f->value); + } + } + else { + fprintf(stderr, "no ibft\n"); + } + } + + for(f = f0; f; f = f->next) { + switch(f->key) { + case key_ibft_hwaddr: + str_copy(&config.net.device, f->value); + config.net.device_given = 1; + break; + + case key_ibft_ipaddr: + name2inet(&config.net.hostname, f->value); + net_check_address2(&config.net.hostname, 0); + break; + + case key_ibft_netmask: + name2inet(&config.net.netmask, f->value); + net_check_address2(&config.net.netmask, 0); + break; + + case key_ibft_gateway: + name2inet(&config.net.gateway, f->value); + net_check_address2(&config.net.gateway, 0); + break; + + case key_ibft_dns: + name2inet(&config.net.nameserver[0], f->value); + net_check_address2(&config.net.nameserver[0], 0); + break; + + default: + break; + } + } +} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.19/util.h new/linuxrc-2.1.20/util.h --- old/linuxrc-2.1.19/util.h 2006-11-20 15:56:34.000000000 +0100 +++ new/linuxrc-2.1.20/util.h 2007-02-02 15:03:25.000000000 +0100 @@ -155,3 +155,5 @@ int system_log(char *cmd); int get_url(char *src_url, char *dst); +void read_iscsi_ibft(void); + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.19/VERSION new/linuxrc-2.1.20/VERSION --- old/linuxrc-2.1.19/VERSION 2007-01-26 13:02:41.000000000 +0100 +++ new/linuxrc-2.1.20/VERSION 2007-02-02 15:17:31.000000000 +0100 @@ -1 +1 @@ -2.1.19 +2.1.20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org