Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2019-03-27 16:12:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc" Wed Mar 27 16:12:36 2019 rev:268 rq:686439 version:6.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2019-03-04 09:09:00.896721590 +0100 +++ /work/SRC/openSUSE:Factory/.linuxrc.new.25356/linuxrc.changes 2019-03-27 16:12:37.731648791 +0100 @@ -1,0 +2,16 @@ +Tue Mar 19 14:00:53 UTC 2019 - [email protected] + +- merge gh#openSUSE/linuxrc#187 +- fix network dialog workflow when VLAN is active (bsc#1124654) +- add more logging in test mode +- add a bit of explanation +- 6.0.9 + +-------------------------------------------------------------------- +Mon Mar 18 14:46:25 UTC 2019 - [email protected] + +- merge gh#openSUSE/linuxrc#186 +- Fix usage of a out-of-scope vector constructor. +- 6.0.8 + +-------------------------------------------------------------------- Old: ---- linuxrc-6.0.7.tar.xz New: ---- linuxrc-6.0.9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.o4mx8P/_old 2019-03-27 16:12:38.371648628 +0100 +++ /var/tmp/diff_new_pack.o4mx8P/_new 2019-03-27 16:12:38.371648628 +0100 @@ -17,7 +17,7 @@ Name: linuxrc -Version: 6.0.7 +Version: 6.0.9 Release: 0 Summary: SUSE Installation Program License: GPL-3.0+ ++++++ linuxrc-6.0.7.tar.xz -> linuxrc-6.0.9.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-6.0.7/VERSION new/linuxrc-6.0.9/VERSION --- old/linuxrc-6.0.7/VERSION 2019-03-01 15:34:45.000000000 +0100 +++ new/linuxrc-6.0.9/VERSION 2019-03-19 15:00:53.000000000 +0100 @@ -1 +1 @@ -6.0.7 +6.0.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-6.0.7/changelog new/linuxrc-6.0.9/changelog --- old/linuxrc-6.0.7/changelog 2019-03-01 15:34:45.000000000 +0100 +++ new/linuxrc-6.0.9/changelog 2019-03-19 15:00:53.000000000 +0100 @@ -1,3 +1,13 @@ +2019-03-19: 6.0.9 + - merge gh#openSUSE/linuxrc#187 + - fix network dialog workflow when VLAN is active (bsc#1124654) + - add more logging in test mode + - add a bit of explanation + +2019-03-18: 6.0.8 + - merge gh#openSUSE/linuxrc#186 + - Fix usage of a out-of-scope vector constructor. + 2019-03-01: 6.0.7 - merge gh#openSUSE/linuxrc#185 - adjust copyright year (bsc#1127464) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-6.0.7/net.c new/linuxrc-6.0.9/net.c --- old/linuxrc-6.0.7/net.c 2019-03-01 15:34:45.000000000 +0100 +++ new/linuxrc-6.0.9/net.c 2019-03-19 15:00:53.000000000 +0100 @@ -150,7 +150,12 @@ if(rc) return -1; } - if(config.win && config.net.setup != NS_DHCP) { + /* + * VLANID is handled in net_input_vlanid() a few lines above. Take this + * into account when deciding if there's anything else besides DHCP to be + * done. + */ + if(config.win && (config.net.setup & ~NS_VLANID) != NS_DHCP) { if( config.net.setup & NS_DHCP && #if defined(__s390__) || defined(__s390x__) @@ -1164,6 +1169,8 @@ if(config.test) { config.net.dhcp_active = 1; + log_info("test mode: DHCP activated\n"); + return; } @@ -2592,7 +2599,12 @@ strprintf(&buf, "wicked ifup %s", ifname); } - if(!config.test) lxrc_run(buf); + if(!config.test) { + lxrc_run(buf); + } + else { + log_info("test mode: 'wicked ifup %s' called\n", ifname); + } sleep(config.net.ifup_wait + 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-6.0.7/url.c new/linuxrc-6.0.9/url.c --- old/linuxrc-6.0.7/url.c 2019-03-01 15:34:45.000000000 +0100 +++ new/linuxrc-6.0.9/url.c 2019-03-19 15:00:53.000000000 +0100 @@ -1441,7 +1441,7 @@ hd_t *hd; hd_res_t *res; char *hwaddr; - hd_hw_item_t *hw_items = (hd_hw_item_t[]) { hw_network_ctrl, hw_network, 0 }; + hd_hw_item_t hw_items[3] = { hw_network_ctrl, hw_network, 0 }; str_list_t *sl; char *url_device; @@ -1459,17 +1459,18 @@ if(!url->is.network) { switch(url->scheme) { case inst_cdrom: - hw_items = (hd_hw_item_t[]) { hw_cdrom, 0 }; + hw_items[0] = hw_cdrom; break; case inst_floppy: - hw_items = (hd_hw_item_t[]) { hw_floppy, 0 }; + hw_items[0] = hw_floppy; break; default: - hw_items = (hd_hw_item_t[]) { hw_block, 0 }; + hw_items[0] = hw_block; break; } + hw_items[1] = 0; } url_device = url->device;
