Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2014-02-07 10:26:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-02-04 22:42:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-02-07 10:26:19.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 5 15:39:00 CET 2014 - [email protected] + +- recognize s390 point-to-point devices + (this is a merge of commit 44607df402171569048c79df95a17e8b28aeb0ab) + +------------------------------------------------------------------- Old: ---- linuxrc-4.2.5.tar.bz2 New: ---- linuxrc-4.2.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.jH09KU/_old 2014-02-07 10:26:19.000000000 +0100 +++ /var/tmp/diff_new_pack.jH09KU/_new 2014-02-07 10:26:19.000000000 +0100 @@ -25,9 +25,9 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 4.2.5 +Version: 4.2.6 Release: 0 -Source: linuxrc-4.2.5.tar.bz2 +Source: linuxrc-4.2.6.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-4.2.5.tar.bz2 -> linuxrc-4.2.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.5/VERSION new/linuxrc-4.2.6/VERSION --- old/linuxrc-4.2.5/VERSION 2014-02-03 14:45:56.000000000 +0100 +++ new/linuxrc-4.2.6/VERSION 2014-02-05 15:38:57.000000000 +0100 @@ -1 +1 @@ -4.2.5 +4.2.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.5/auto2.c new/linuxrc-4.2.6/auto2.c --- old/linuxrc-4.2.5/auto2.c 2013-11-29 12:09:41.000000000 +0100 +++ new/linuxrc-4.2.6/auto2.c 2014-02-05 15:04:42.000000000 +0100 @@ -576,7 +576,15 @@ if(!config.net.do_setup) return; - if((net_config_mask() & 3) == 3) { /* we have ip & netmask */ + if (config.net.device) { + net_is_ptp_im = FALSE; + if(strstr(config.net.device, "plip") == config.net.device) net_is_ptp_im = TRUE; + if(strstr(config.net.device, "iucv") == config.net.device) net_is_ptp_im = TRUE; + if(strstr(config.net.device, "ctc") == config.net.device) net_is_ptp_im = TRUE; + } + + if( ((net_config_mask() & 3) == 3) || (net_is_ptp_im && ((net_config_mask() & 1) == 1)) ) { + /* we have IP & netmask (or just IP for PTP devices) */ config.net.configured = nc_static; /* looks a bit weird, but we need it here for net_activate_ns() */ if(!config.net.device) str_copy(&config.net.device, config.netdevice); @@ -637,12 +645,6 @@ if(config.net.configured == nc_none) { config.vnc = config.usessh = 0; } - else { - net_is_ptp_im = FALSE; - if(strstr(config.net.device, "plip") == config.net.device) net_is_ptp_im = TRUE; - if(strstr(config.net.device, "iucv") == config.net.device) net_is_ptp_im = TRUE; - if(strstr(config.net.device, "ctc") == config.net.device) net_is_ptp_im = TRUE; - } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.5/changelog new/linuxrc-4.2.6/changelog --- old/linuxrc-4.2.5/changelog 2014-02-03 14:45:57.000000000 +0100 +++ new/linuxrc-4.2.6/changelog 2014-02-05 15:38:58.000000000 +0100 @@ -1,4 +1,8 @@ -2014-02-03: HEAD +2014-02-05: HEAD + - recognnize s390 point-to-point devices + - this is a merge of commit 44607df402171569048c79df95a17e8b28aeb0ab + +2014-02-03: 4.2.5 - reduce dependency on arch-specific defines - add basic wicked support (dhcpv4) - don't run scripts in test mode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.5/url.c new/linuxrc-4.2.6/url.c --- old/linuxrc-4.2.5/url.c 2013-11-18 14:06:40.000000000 +0100 +++ new/linuxrc-4.2.6/url.c 2014-02-05 15:04:42.000000000 +0100 @@ -2260,6 +2260,7 @@ } +extern int net_is_ptp_im; /* * Setup network interface. * @@ -2310,8 +2311,16 @@ if(config.net.configured == nc_none) config.net.configured = nc_static; + if (config.net.device) { + net_is_ptp_im = FALSE; + if(strstr(config.net.device, "plip") == config.net.device) net_is_ptp_im = TRUE; + if(strstr(config.net.device, "iucv") == config.net.device) net_is_ptp_im = TRUE; + if(strstr(config.net.device, "ctc") == config.net.device) net_is_ptp_im = TRUE; + } + /* we need at least ip & netmask for static network config */ - if((net_config_mask() & 3) != 3) { + /* just netmask for PTP devices */ + if(!net_is_ptp_im && (net_config_mask() & 3) != 3) { printf( "Sending %s request to %s...\n", config.net.ipv6 ? "DHCP6" : "DHCP", -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
