Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2014-05-17 22:01:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc" Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2014-05-10 08:32:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-05-17 22:02:00.000000000 +0200 @@ -1,0 +2,22 @@ +Fri May 16 16:05:44 CEST 2014 - [email protected] + +- pass debug option to helper scripts +- 4.2.26 + +------------------------------------------------------------------- +Thu May 15 15:15:11 CEST 2014 - [email protected] + +- suppress edd failed message +- 4.2.25 + +------------------------------------------------------------------- +Thu May 15 11:10:05 CEST 2014 - [email protected] + +- Revert changes to use IBM-supplied chzdev command instead of our *_configure commands. +- Move check for config.hwp.layer2 to the correct line. +- Fix for bnc #855696 +- Only ask if DHCP is to be used for Layer 2 interfaces. +- Fix the insane handling of the layer2 parameter. Just use the 0 or 1 that the kernel understands. +- 4.2.24 + +------------------------------------------------------------------- Old: ---- linuxrc-4.2.23.tar.xz New: ---- linuxrc-4.2.26.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.nzyB5c/_old 2014-05-17 22:02:01.000000000 +0200 +++ /var/tmp/diff_new_pack.nzyB5c/_new 2014-05-17 22:02:01.000000000 +0200 @@ -25,9 +25,9 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 4.2.23 +Version: 4.2.26 Release: 0 -Source: linuxrc-4.2.23.tar.xz +Source: linuxrc-4.2.26.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-4.2.23.tar.xz -> linuxrc-4.2.26.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.23/VERSION new/linuxrc-4.2.26/VERSION --- old/linuxrc-4.2.23/VERSION 2014-05-08 14:54:40.000000000 +0200 +++ new/linuxrc-4.2.26/VERSION 2014-05-16 16:05:35.000000000 +0200 @@ -1 +1 @@ -4.2.23 +4.2.26 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.23/changelog new/linuxrc-4.2.26/changelog --- old/linuxrc-4.2.23/changelog 2014-05-08 14:54:42.000000000 +0200 +++ new/linuxrc-4.2.26/changelog 2014-05-16 16:05:37.000000000 +0200 @@ -1,4 +1,26 @@ -2014-05-08: HEAD +2014-05-16: HEAD + - pass debug option to help scripts + +2014-05-15: 4.2.25 + - suppress edd failed message + +2014-05-15: 4.2.24 + - fix compilation + - Merge pull request #8 from openSUSE/layer2test + - Layer2test + - Adjust the branch to match the current master. + - Revert "Initial changes to use IBM-supplied chzdev command instead of our *_configure commands." + - The feature request in FATE for this was withdrawn. + - This reverts commit 883b0f334dfcc00cc03a24911522fb4de57c4a83. + - Move check for config.hwp.layer2 to the correct line. + - Fix for bnc #855696 + - Only ask if DHCP is to be used for Layer 2 interfaces. + - If a inteface is already defined, check sysfs to find out + if it is layer 2 or not and set config.hwp.layer2 accordingly. + - Fix the insane handling of the layer2 parameter. Just use the 0 or 1 that the kernel understands. + - message + +2014-05-08: 4.2.23 - don't load any fonts anymore (bnc #875592) 2014-05-08: 4.2.22 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.23/file.c new/linuxrc-4.2.26/file.c --- old/linuxrc-4.2.23/file.c 2014-04-24 14:35:53.000000000 +0200 +++ new/linuxrc-4.2.26/file.c 2014-05-15 10:49:40.000000000 +0200 @@ -1195,7 +1195,7 @@ if(*f->value) config.hwp.interface=file_sym2num(f->value); break; case key_layer2: - if(f->is.numeric) config.hwp.layer2 = f->nvalue + 1; + if(f->is.numeric) config.hwp.layer2 = f->nvalue; break; case key_portno: if(f->is.numeric) config.hwp.portno = f->nvalue + 1; @@ -1860,7 +1860,7 @@ file_write_str(f, key_netcardname, config.net.cardname); #if defined(__s390__) || defined(__s390x__) if(config.hwp.osahwaddr) file_write_str(f, key_osahwaddr, config.hwp.osahwaddr); - if(config.hwp.layer2) file_write_num(f, key_layer2, config.hwp.layer2 - 1); + if(config.hwp.layer2) file_write_num(f, key_layer2, config.hwp.layer2); #endif file_write_str(f, key_ethtool, config.net.ethtool_used); file_write_inet2(f, key_ip, &config.net.hostname, INET_WRITE_IP_BOTH + INET_WRITE_PREFIX); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.23/linuxrc.c new/linuxrc-4.2.26/linuxrc.c --- old/linuxrc-4.2.23/linuxrc.c 2014-05-08 09:40:20.000000000 +0200 +++ new/linuxrc-4.2.26/linuxrc.c 2014-05-15 14:18:08.000000000 +0200 @@ -869,7 +869,7 @@ // we might need edd for udev if(util_check_exist("/modules/edd.ko")) { - system("/sbin/insmod /modules/edd.ko"); + system("/sbin/insmod /modules/edd.ko 2>/dev/null"); } if(!config.test) { @@ -1004,14 +1004,14 @@ mod_modprobe("zfcp",""); if(util_read_and_chop("/sys/firmware/ipl/device", device, sizeof device)) { - sprintf(cmd,"/sbin/chzdev zfcp %s -i",device); + sprintf(cmd,"/sbin/zfcp_host_configure %s 1",device); fprintf(stderr,"executing %s\n",cmd); if(!config.test) system(cmd); if(util_read_and_chop("/sys/firmware/ipl/wwpn", wwpn, sizeof wwpn)) { if(util_read_and_chop("/sys/firmware/ipl/lun", lun, sizeof lun)) { - sprintf(cmd,"/sbin/chzdev zfcp %s:%s:%s -i",device,wwpn,lun); + sprintf(cmd,"/sbin/zfcp_disk_configure %s %s %s 1",device,wwpn,lun); fprintf(stderr,"executing %s\n",cmd); if(!config.test) system(cmd); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.23/net.c new/linuxrc-4.2.26/net.c --- old/linuxrc-4.2.23/net.c 2014-04-24 14:35:53.000000000 +0200 +++ new/linuxrc-4.2.26/net.c 2014-05-15 11:03:39.000000000 +0200 @@ -210,7 +210,13 @@ config.net.configured = nc_none; if(config.win && config.net.setup != NS_DHCP) { - if(config.net.setup & NS_DHCP && !config.net.ptp) { + if( + config.net.setup & NS_DHCP && +#if defined(__s390__) || defined(__s390x__) + config.hwp.layer2 && +#endif + !config.net.ptp + ) { sprintf(buf, "Automatic configuration via %s?", "DHCP"); rc = dia_yesno(buf, NO); } @@ -1477,6 +1483,12 @@ if(choice) last_item = choice; } +/* + * + * If item_devs[choice - 1] has a value, then that means the interface should already + * configured. If so, we can check sysfs to see if we should be using layer2 or not. + * + */ if(choice > 0 && !item_devs[choice - 1]) { #if defined(__s390__) || defined(__s390x__) fprintf(stderr, "activate s390 devs 2\n"); @@ -1491,6 +1503,16 @@ } #endif } +#if defined(__s390__) || defined(__s390x__) + else { + char path[PATH_MAX]=""; + char *type; + sprintf(path, "/sys/class/net/%s/device/layer2", item_devs[choice - 1]); + type = util_get_attr(path); + if(!strncmp(type, "1", sizeof "1" )) {config.hwp.layer2=1; } + else {config.hwp.layer2=0;} + } +#endif if(choice > 0) { str_copy(&config.net.device, item_devs[choice - 1]); @@ -2326,6 +2348,7 @@ int i; fprintf(stderr, "checking CCW address %s\n",addr); /* format: x.x.xxxx, each x is a hex digit */ + if(!addr) goto error; if(strlen(addr)!=8) goto error; for(i=0;i<8;i++) { @@ -2584,9 +2607,9 @@ IFNOTAUTO(config.hwp.layer2) { - config.hwp.layer2 = dia_yesno("Enable OSI Layer 2 support?", YES) == YES ? 2 : 1; + config.hwp.layer2 = dia_yesno("Enable OSI Layer 2 support?", YES) == YES ? 1 : 0; } - if(config.hwp.layer2 == 2) { + if(config.hwp.layer2 == 1) { IFNOTAUTO(config.hwp.osahwaddr) { dia_input2("MAC address", &config.hwp.osahwaddr, 17, 1); } @@ -2637,27 +2660,25 @@ case di_390net_escon: setup_ctc: if(config.hwp.protocol > 0) - sprintf(cmd, "/sbin/chzdev ctc %s:%s -i protocol=%d", config.hwp.readchan, config.hwp.writechan, config.hwp.protocol - 1); + sprintf(cmd, "ctc_configure %s %s 1 %d", config.hwp.readchan, config.hwp.writechan, config.hwp.protocol - 1); else - sprintf(cmd, "/sbin/chzdev ctc %s:%s -i", config.hwp.readchan, config.hwp.writechan); + sprintf(cmd, "ctc_configure %s %s 1", config.hwp.readchan, config.hwp.writechan); break; case di_390net_hsi: case di_390net_osa: if (config.hwp.interface == di_osa_lcs) - sprintf(cmd, "/sbin/chzdev lcs ctc %s:%s -i protocol=0", config.hwp.readchan, config.hwp.writechan); - else { - ccmd += sprintf(ccmd, "/sbin/qeth_configure "); - if(config.hwp.portno) - ccmd += sprintf(ccmd, "-n %d ", config.hwp.portno - 1); - ccmd += sprintf(ccmd, "%s%s%s %s %s %s %s 1", - config.hwp.portname ? "-p \"" : "", - config.hwp.portname ? config.hwp.portname : "", - config.hwp.portname ? "\"" : "", - config.hwp.layer2 == 2 ? "-l" : "", - config.hwp.readchan, - config.hwp.writechan, - config.hwp.datachan); - } + goto setup_ctc; + ccmd += sprintf(ccmd, "qeth_configure "); + if(config.hwp.portno) + ccmd += sprintf(ccmd, "-n %d ", config.hwp.portno - 1); + ccmd += sprintf(ccmd, "%s%s%s %s %s %s %s 1", + config.hwp.portname ? "-p \"" : "", + config.hwp.portname ? config.hwp.portname : "", + config.hwp.portname ? "\"" : "", + config.hwp.layer2 == 2 ? "-l" : "", + config.hwp.readchan, + config.hwp.writechan, + config.hwp.datachan); break; default: sprintf(cmd, "unknown s390 network type %d", config.hwp.type); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.23/url.c new/linuxrc-4.2.26/url.c --- old/linuxrc-4.2.23/url.c 2014-04-24 14:35:53.000000000 +0200 +++ new/linuxrc-4.2.26/url.c 2014-05-14 16:24:25.000000000 +0200 @@ -1171,7 +1171,7 @@ fprintf(stderr, "nfs: %s: is file, mounting one level up\n", url->path); } - if(err == ENOTDIR || err == ENOENT || url->is.file) { + if(err || url->is.file) { str_copy(&url->mount, NULL); str_copy(&buf, url->path); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.23/util.c new/linuxrc-4.2.26/util.c --- old/linuxrc-4.2.23/util.c 2014-05-02 15:36:28.000000000 +0200 +++ new/linuxrc-4.2.26/util.c 2014-05-16 15:52:13.000000000 +0200 @@ -4439,6 +4439,11 @@ file_write_install_inf(""); + if(config.debug) { + strprintf(&buf, "%d", config.debug); + setenv("linuxrc_debug", buf, 1); + } + strprintf(&buf, "/scripts/%s", name); system(buf); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
