Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2016-10-10 17:33:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-09-17 14:31:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2016-10-10 17:33:34.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 30 14:55:23 UTC 2016 - [email protected] + +- don't configure ibft devices in linuxrc (bsc#997598) +- 5.0.86 + +------------------------------------------------------------------- Old: ---- linuxrc-5.0.85.tar.xz New: ---- linuxrc-5.0.86.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.xZ7FGz/_old 2016-10-10 17:33:35.000000000 +0200 +++ /var/tmp/diff_new_pack.xZ7FGz/_new 2016-10-10 17:33:35.000000000 +0200 @@ -25,7 +25,7 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 5.0.85 +Version: 5.0.86 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ linuxrc-5.0.85.tar.xz -> linuxrc-5.0.86.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.85/VERSION new/linuxrc-5.0.86/VERSION --- old/linuxrc-5.0.85/VERSION 2016-09-13 15:10:49.000000000 +0200 +++ new/linuxrc-5.0.86/VERSION 2016-09-30 16:50:19.000000000 +0200 @@ -1 +1 @@ -5.0.85 +5.0.86 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.85/changelog new/linuxrc-5.0.86/changelog --- old/linuxrc-5.0.85/changelog 2016-09-13 15:10:49.000000000 +0200 +++ new/linuxrc-5.0.86/changelog 2016-09-30 16:50:19.000000000 +0200 @@ -1,3 +1,6 @@ +2016-09-30: 5.0.86 + - don't configure ibft devices in linuxrc (bsc #997598) + 2016-09-13: 5.0.85 - Don't enforce keymap conversion to unicode - Unify keymaps with YaST after recent changes in yast2-country diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.85/file.c new/linuxrc-5.0.86/file.c --- old/linuxrc-5.0.85/file.c 2016-09-13 15:10:49.000000000 +0200 +++ new/linuxrc-5.0.86/file.c 2016-09-30 16:50:19.000000000 +0200 @@ -309,6 +309,7 @@ { key_sethostname, "SetHostname", kf_cfg + kf_cmd_early }, { key_debugshell, "DebugShell", kf_cfg + kf_cmd + kf_cmd_early }, { key_self_update, "SelfUpdate", kf_cfg + kf_cmd }, + { key_ibft_devices, "IBFTDevices", kf_cfg + kf_cmd }, }; static struct { @@ -1768,6 +1769,10 @@ } break; + case key_ibft_devices: + slist_assign_values(&config.ifcfg.ibft, f->value); + break; + default: break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.85/file.h new/linuxrc-5.0.86/file.h --- old/linuxrc-5.0.85/file.h 2016-09-13 15:10:49.000000000 +0200 +++ new/linuxrc-5.0.86/file.h 2016-09-30 16:50:19.000000000 +0200 @@ -54,7 +54,8 @@ key_namescheme, key_ptoptions, key_is_ptoption, key_withfcoe, key_digests, key_plymouth, key_sslcerts, key_restart, key_restarted, key_autoyast2, key_withipoib, key_upgrade, key_ifcfg, key_defaultinstall, key_nanny, key_vlanid, - key_sshkey, key_systemboot, key_sethostname, key_debugshell, key_self_update + key_sshkey, key_systemboot, key_sethostname, key_debugshell, key_self_update, + key_ibft_devices } file_key_t; typedef enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.85/global.h new/linuxrc-5.0.86/global.h --- old/linuxrc-5.0.85/global.h 2016-09-13 15:10:49.000000000 +0200 +++ new/linuxrc-5.0.86/global.h 2016-09-30 16:50:19.000000000 +0200 @@ -690,6 +690,7 @@ slist_t *if_up; /* network interfaces != lo that are 'up' */ char *current; /* interface name for last written ifcfg file */ slist_t *to_global; /* keys that go to global /etc/sysconfig/network/config */ + slist_t *ibft; /* list of ibft interfaces (not to be configured by linuxrc) */ } ifcfg; struct { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.85/linuxrc.c new/linuxrc-5.0.86/linuxrc.c --- old/linuxrc-5.0.85/linuxrc.c 2016-09-13 15:10:49.000000000 +0200 +++ new/linuxrc-5.0.86/linuxrc.c 2016-09-30 16:50:19.000000000 +0200 @@ -676,6 +676,7 @@ void lxrc_init() { int i; + slist_t *sl; siginterrupt(SIGALRM, 1); signal(SIGHUP, SIG_IGN); @@ -964,6 +965,13 @@ util_run_script("early_setup"); + file_read_info_file("file:/etc/ibft_devices", kf_cfg); + + // ibft interfaces are handled by wicked + for(sl = config.ifcfg.ibft; sl; sl = sl->next) { + slist_append_str(&config.ifcfg.initial, sl->key); + } + if(config.plymouth) util_run_script("plymouth_setup"); util_free_mem(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.85/util.c new/linuxrc-5.0.86/util.c --- old/linuxrc-5.0.85/util.c 2016-09-13 15:10:49.000000000 +0200 +++ new/linuxrc-5.0.86/util.c 2016-09-30 16:50:19.000000000 +0200 @@ -1268,6 +1268,16 @@ } } + if(config.ifcfg.ibft) { + strcpy(buf, "ibft interfaces:"); + slist_append_str(&sl0, buf); + for(sl = config.ifcfg.ibft; sl; sl = sl->next) { + if(!sl->key) continue; + sprintf(buf, " %s", sl->key); + slist_append_str(&sl0, buf); + } + } + if(config.ifcfg.if_state) { strcpy(buf, "network interface states:"); slist_append_str(&sl0, buf); @@ -4314,17 +4324,21 @@ } +/* + * Don't actually do anything except loading the required modules and + * logging a bit. + * + * ibft devices are handled by wicked now. + */ int iscsi_check() { int iscsi_ok = 0; char *s, *sysfs_ibft = NULL, *attr = NULL; char *if_name = NULL, *if_mac = NULL, *ibft_mac = NULL; unsigned use_dhcp = 0; - int mac_match, vlan, prefix = -1; + int mac_match; struct dirent *de; DIR *d; - ifcfg_t *ifcfg = NULL; - slist_t *sl; if(util_check_exist("/modules/iscsi_ibft.ko")) { lxrc_run("/sbin/modprobe iscsi_ibft"); @@ -4387,59 +4401,6 @@ log_info("ibft: macs %smatch\n", mac_match ? "" : "don't "); - if(if_name) { - ifcfg = calloc(1, sizeof *ifcfg); - - str_copy(&ifcfg->device, if_name); - - strprintf(&attr, "%s/vlan", sysfs_ibft); - vlan = util_get_int_attr(attr); - log_info("ibft: vlan = %d\n", vlan); - if(vlan > 0) strprintf(&ifcfg->vlan, "%d", vlan); - - if(use_dhcp) { - ifcfg->dhcp = 1; - strprintf(&ifcfg->type, "dhcp%s", net_dhcp_type()); - } - else { - if(!mac_match) { - sl = slist_append(&ifcfg->flags, slist_new()); - str_copy(&sl->key, "STARTMODE"); - str_copy(&sl->value, "nfsroot"); - } - - strprintf(&attr, "%s/subnet-mask", sysfs_ibft); - s = util_get_attr(attr); - log_info("ibft: subnet-mask = %s\n", s); - prefix = netmask_to_prefix(s); - - strprintf(&attr, "%s/ip-addr", sysfs_ibft); - s = util_get_attr(attr); - if(*s) { - str_copy(&ifcfg->ip, s); - if(prefix > 0) strprintf(&ifcfg->ip, "%s/%d", ifcfg->ip, prefix); - } - log_info("ibft: ip-addr = %s\n", ifcfg->ip ?: ""); - - strprintf(&attr, "%s/gateway", sysfs_ibft); - s = util_get_attr(attr); - log_info("ibft: gateway = %s\n", s); - if(*s) str_copy(&ifcfg->gw, s); - - strprintf(&attr, "%s/primary-dns", sysfs_ibft); - s = util_get_attr(attr); - log_info("ibft: primary-dns = %s\n", s); - if(*s) str_copy(&ifcfg->ns, s); - - strprintf(&attr, "%s/secondary-dns", sysfs_ibft); - s = util_get_attr(attr); - log_info("ibft: secondary-dns = %s\n", s); - if(*s) strprintf(&ifcfg->ns, "%s %s", ifcfg->ns ?: "", s); - } - - ifcfg_append(&config.ifcfg.list, ifcfg); - } - str_copy(&attr, NULL); str_copy(&if_name, NULL); str_copy(&if_mac, NULL);
