Hello community, here is the log from the commit of package linuxrc checked in at Fri Jun 9 23:28:50 CEST 2006. -------- --- linuxrc/linuxrc.changes 2006-05-18 17:13:47.000000000 +0200 +++ linuxrc/linuxrc.changes 2006-06-09 15:08:11.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Jun 9 15:08:05 CEST 2006 - snwint@suse.de + +- fixed device name matching for hard disk install (#177055) +- read /proc/cmdline with fread() instead of fgets() (i.e. do not + stop at LF, bug #176095) +- strip - and _ from both given parameters and parameter keywords; + otherwise parameters with these characters won't match their + keywords (bug #165458) +- s390: add layer2 parameter to set layer2 option (bug #168492) +- s390: don't show layer2 dialog if network IF is hsi (not + supported) + +------------------------------------------------------------------- Old: ---- linuxrc-2.0.42.tar.bz2 New: ---- linuxrc-2.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.hAt42y/_old 2006-06-09 23:28:35.000000000 +0200 +++ /var/tmp/diff_new_pack.hAt42y/_new 2006-06-09 23:28:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 2.0.42) +# spec file for package linuxrc (Version 2.1.0) # # Copyright (c) 2006 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.0.42 +Version: 2.1.0 Release: 1 -Source: linuxrc-2.0.42.tar.bz2 +Source: linuxrc-2.1.0.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,6 +53,16 @@ %doc linuxrc.html %changelog -n linuxrc +* Fri Jun 09 2006 - snwint@suse.de +- fixed device name matching for hard disk install (#177055) +- read /proc/cmdline with fread() instead of fgets() (i.e. do not + stop at LF, bug #176095) +- strip - and _ from both given parameters and parameter keywords; + otherwise parameters with these characters won't match their + keywords (bug #165458) +- s390: add layer2 parameter to set layer2 option (bug #168492) +- s390: don't show layer2 dialog if network IF is hsi (not + supported) * Thu May 18 2006 - snwint@suse.de - increase klog buffer so we don't miss important kernel messages (#172971) - s390: add layer2 option for qdio/eth interfaces ++++++ linuxrc-2.0.42.tar.bz2 -> linuxrc-2.1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.0.42/Changelog new/linuxrc-2.1.0/Changelog --- old/linuxrc-2.0.42/Changelog 2006-05-18 17:09:13.000000000 +0200 +++ new/linuxrc-2.1.0/Changelog 2006-06-09 15:07:05.000000000 +0200 @@ -1,3 +1,14 @@ +9/6/2006: v2.1.0 + - fixed device name matching for hard disk install (#177055) + - read /proc/cmdline with fread() instead of fgets() (i.e. do not + stop at LF, bug #176095) + - strip - and _ from both given parameters and parameter keywords; + otherwise parameters with these characters won't match their + keywords (bug #165458) + - s390: add layer2 parameter to set layer2 option (bug #168492) + - s390: don't show layer2 dialog if network IF is hsi (not + supported) + 18/5/2006: v2.0.42 - increase klog buffer so we don't miss important kernel messages (#172971) - s390: add layer2 option for qdio/eth interfaces diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.0.42/VERSION new/linuxrc-2.1.0/VERSION --- old/linuxrc-2.0.42/VERSION 2006-05-18 11:17:59.000000000 +0200 +++ new/linuxrc-2.1.0/VERSION 2006-06-09 15:07:19.000000000 +0200 @@ -1 +1 @@ -2.0.42 +2.1.0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.0.42/auto2.c new/linuxrc-2.1.0/auto2.c --- old/linuxrc-2.0.42/auto2.c 2006-05-12 12:43:45.000000000 +0200 +++ new/linuxrc-2.1.0/auto2.c 2006-06-09 15:06:20.000000000 +0200 @@ -132,6 +132,7 @@ hd_set_probe_feature(hd_data, log_file ? pr_default : pr_lxrc); hd_clear_probe_feature(hd_data, pr_parallel); + hd_clear_probe_feature(hd_data, pr_udev); #if !defined(__s390__) && !defined(__s390x__) if(!log_file) hd_data->progress = auto2_progress; #endif @@ -350,6 +351,9 @@ * >1: device found, but continue search * */ + +extern str_list_t *search_str_list(str_list_t *sl, char *str); /* libhd function */ + int auto2_harddisk_dev(hd_t **hd0) { int i = 1; @@ -367,7 +371,8 @@ if( config.partition && - strcmp(config.partition, short_dev(hd->unix_dev_name)) + strcmp(hd->unix_dev_name, long_dev(config.partition)) && + !search_str_list(hd->unix_dev_names, long_dev(config.partition)) ) continue; fprintf(stderr, "disk: trying to mount: %s\n", hd->unix_dev_name); @@ -1191,6 +1196,7 @@ hd_data = calloc(1, sizeof *hd_data); hd_set_probe_feature(hd_data, pr_lxrc); hd_clear_probe_feature(hd_data, pr_parallel); + hd_clear_probe_feature(hd_data, pr_udev); hd_scan(hd_data); } @@ -1205,6 +1211,7 @@ hd_data = calloc(1, sizeof *hd_data); hd_set_probe_feature(hd_data, pr_lxrc); hd_clear_probe_feature(hd_data, pr_parallel); + hd_clear_probe_feature(hd_data, pr_udev); hd_scan(hd_data); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.0.42/file.c new/linuxrc-2.1.0/file.c --- old/linuxrc-2.0.42/file.c 2006-05-08 17:17:24.000000000 +0200 +++ new/linuxrc-2.1.0/file.c 2006-06-09 15:05:42.000000000 +0200 @@ -242,6 +242,7 @@ { key_ctcprotocol, "CTCProtocol", kf_cfg + kf_cmd }, { key_osamedium, "OSAMedium", kf_cfg + kf_cmd }, { key_osainterface, "OSAInterface", kf_cfg + kf_cmd }, + { key_layer2, "Layer2", kf_cfg + kf_cmd }, #endif { key_netwait, "NetWait", kf_cfg + kf_cmd }, { key_newid, "NewID", kf_cfg + kf_cmd_early }, @@ -338,29 +339,51 @@ return ""; } - -/* !!! str is overwritten !!! */ -file_key_t file_str2key(char *str, file_key_flag_t flags) -{ +/* compare strings, ignoring '-' and '_' characters in strings not starting + with '_' */ +static int strcasecmpignorestrich(const char* s1, const char* s2) +{ + char* str1 = strdup(s1); + char* str2 = strdup(s2); + char* s; int i; - char *s; - - if(!str || !*str || flags == kf_none) return key_none; + + /* remove all '-' and '_' */ + if(*str1 != '_') { + for(i = 0, s = str1; str1[i]; i++) { + if(str1[i] != '_' && str1[i] != '-') { + *s++ = str1[i]; + } + } + *s = 0; + } /* remove all '-' and '_' */ - if(*str != '_') { - for(i = 0, s = str; str[i]; i++) { - if(str[i] != '_' && str[i] != '-') { - *s++ = str[i]; + if(*str2 != '_') { + for(i = 0, s = str2; str2[i]; i++) { + if(str2[i] != '_' && str2[i] != '-') { + *s++ = str2[i]; } } *s = 0; } + i = strcasecmp(str1, str2); + free(str1); free(str2); + return i; +} + +/* !!! str is overwritten !!! */ +file_key_t file_str2key(char *str, file_key_flag_t flags) +{ + int i; + + if(!str || !*str || flags == kf_none) return key_none; + if(!*str) return key_none; for(i = 0; (unsigned) i < sizeof keywords / sizeof *keywords; i++) { - if((keywords[i].flags & flags) && !strcasecmp(keywords[i].value, str)) { + if((keywords[i].flags & flags) && !strcasecmpignorestrich(keywords[i].value, str)) { return keywords[i].key; } } @@ -1272,6 +1295,9 @@ case key_osainterface: if(*f->value) config.hwp.interface=file_sym2num(f->value); break; + case key_layer2: + if(f->is.numeric) config.hwp.layer2 = f->nvalue + 1; + break; #endif case key_netwait: @@ -1838,7 +1864,7 @@ else { if(!(f = fopen(CMDLINE_FILE, "r"))) return NULL; cmdline = calloc(1024, 1); - if(!fgets(cmdline, 1024, f)) *cmdline = 0; + if(!fread(cmdline, 1, 1023, f)) *cmdline = 0; fclose(f); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.0.42/file.h new/linuxrc-2.1.0/file.h --- old/linuxrc-2.0.42/file.h 2006-05-08 17:14:01.000000000 +0200 +++ new/linuxrc-2.1.0/file.h 2006-06-06 09:29:45.000000000 +0200 @@ -45,7 +45,7 @@ key_instsys_id, key_initrd_id, key_instsys_complain, key_nfstcp, key_osamedium, key_osainterface, key_dud_complain, key_dud_expected, key_staticdevices, key_withiscsi, key_ethtool, key_listen, key_zombies, - key_dhcpcd + key_dhcpcd, key_layer2, } file_key_t; typedef enum { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.0.42/net.c new/linuxrc-2.1.0/net.c --- old/linuxrc-2.0.42/net.c 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.0/net.c 2006-06-06 09:29:45.000000000 +0200 @@ -2027,7 +2027,7 @@ } } - if(config.hwp.medium == di_osa_eth) + if(config.hwp.medium == di_osa_eth && di != di_390net_hsi) { IFNOTAUTO(config.hwp.layer2) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org