Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2014-07-31 21:49:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-31 10:04:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-07-31 21:49:58.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 31 10:29:07 CEST 2014 - snwint@suse.de + +- fix point-to-point interface handling (bnc #889580) +- 5.0.8 + +------------------------------------------------------------------- Old: ---- linuxrc-5.0.7.tar.xz New: ---- linuxrc-5.0.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.sRI2rJ/_old 2014-07-31 21:49:59.000000000 +0200 +++ /var/tmp/diff_new_pack.sRI2rJ/_new 2014-07-31 21:49:59.000000000 +0200 @@ -25,9 +25,9 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 5.0.7 +Version: 5.0.8 Release: 0 -Source: linuxrc-5.0.7.tar.xz +Source: linuxrc-5.0.8.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-5.0.7.tar.xz -> linuxrc-5.0.8.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.7/VERSION new/linuxrc-5.0.8/VERSION --- old/linuxrc-5.0.7/VERSION 2014-07-30 10:56:55.000000000 +0200 +++ new/linuxrc-5.0.8/VERSION 2014-07-31 10:29:00.000000000 +0200 @@ -1 +1 @@ -5.0.7 +5.0.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.7/auto2.c new/linuxrc-5.0.8/auto2.c --- old/linuxrc-5.0.7/auto2.c 2014-07-25 18:13:49.000000000 +0200 +++ new/linuxrc-5.0.8/auto2.c 2014-07-31 10:28:30.000000000 +0200 @@ -584,7 +584,7 @@ { if(!net_config_needed(0)) return; - check_ptp(NULL); + check_ptp(config.ifcfg.manual->device); if( ((net_config_mask() & 3) == 3) || (config.ifcfg.manual->ptp && ((net_config_mask() & 1) == 1)) ) { /* we have IP & netmask (or just IP for PTP devices) */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.7/changelog new/linuxrc-5.0.8/changelog --- old/linuxrc-5.0.7/changelog 2014-07-30 10:56:57.000000000 +0200 +++ new/linuxrc-5.0.8/changelog 2014-07-31 10:29:02.000000000 +0200 @@ -1,4 +1,9 @@ -2014-07-30: HEAD +2014-07-31: HEAD + - Merge pull request #16 from openSUSE/sw_0004 + - fix point-to-point interface handling (bnc #889580) + - fix point-to-point interface handling (bnc #889580) + +2014-07-30: 5.0.7 - Merge pull request #15 from openSUSE/sw_0003 - pass along hostname if explicitly set (bnc #889374) - pass along hostname if explicitly set (bnc #889374) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.7/net.c new/linuxrc-5.0.8/net.c --- old/linuxrc-5.0.7/net.c 2014-07-28 16:37:52.000000000 +0200 +++ new/linuxrc-5.0.8/net.c 2014-07-31 10:28:30.000000000 +0200 @@ -777,7 +777,7 @@ if(choice > 0) { str_copy(&config.ifcfg.manual->device, item_devs[choice - 1]); - check_ptp(NULL); + check_ptp(config.ifcfg.manual->device); if(item_hds && item_hds[choice - 1]) { hd = item_hds[choice - 1]; @@ -813,17 +813,17 @@ */ int net_input_data() { - if((config.net.setup & NS_HOSTIP)) { - if(net_get_ip( - "Enter your IP address with network prefix.\n\n" - "You can enter more than one, separated by space, if necessary.\n" - "Leave empty for autoconfig.\n\n" - "Examples: 192.168.5.77/24 2001:db8:75:fff::3/64", - &config.ifcfg.manual->ip, 1) == 2 - ) return -1; - } - if(config.ifcfg.manual->ptp) { + if((config.net.setup & NS_HOSTIP)) { + if(net_get_ip( + "Enter your IP address.\n\n" + "You can enter more than one, separated by space, if necessary.\n" + "Leave empty for autoconfig.\n\n" + "Examples: 192.168.5.77 2001:db8:75:fff::3", + &config.ifcfg.manual->ip, 0) == 2 + ) return -1; + } + if(net_get_ip( "Enter the IP address of the PLIP partner.\n\n" "Examples: 192.168.5.77 2001:db8:75:fff::3", @@ -831,32 +831,42 @@ ) return -1; } else { - if((config.net.setup & NS_GATEWAY)) { + if((config.net.setup & NS_HOSTIP)) { if(net_get_ip( - "Enter your gateway IP address.\n\n" + "Enter your IP address with network prefix.\n\n" "You can enter more than one, separated by space, if necessary.\n" - "Leave empty if you don't need one.\n\n" - "Examples: 192.168.5.77 2001:db8:75:fff::3", - &config.ifcfg.manual->gw, 0) == 2 + "Leave empty for autoconfig.\n\n" + "Examples: 192.168.5.77/24 2001:db8:75:fff::3/64", + &config.ifcfg.manual->ip, 1) == 2 ) return -1; } - if((config.net.setup & NS_NAMESERVER)) { + if((config.net.setup & NS_GATEWAY)) { if(net_get_ip( - "Enter your name server IP address.\n\n" + "Enter your gateway IP address.\n\n" "You can enter more than one, separated by space, if necessary.\n" "Leave empty if you don't need one.\n\n" "Examples: 192.168.5.77 2001:db8:75:fff::3", - &config.ifcfg.manual->ns, 0) == 2 + &config.ifcfg.manual->gw, 0) == 2 ) return -1; - - dia_input2( - "Enter your search domains, separated by a space.", - &config.ifcfg.manual->domain, 40, 0 - ); } } + if((config.net.setup & NS_NAMESERVER)) { + if(net_get_ip( + "Enter your name server IP address.\n\n" + "You can enter more than one, separated by space, if necessary.\n" + "Leave empty if you don't need one.\n\n" + "Examples: 192.168.5.77 2001:db8:75:fff::3", + &config.ifcfg.manual->ns, 0) == 2 + ) return -1; + + dia_input2( + "Enter your search domains, separated by a space.", + &config.ifcfg.manual->domain, 40, 0 + ); + } + return 0; } @@ -2582,14 +2592,12 @@ /* - * Check if interface is a ptp interface and set config.ifcfg.manual accordingly. + * Check if interface is a ptp interface and set config.ifcfg.manual->ptp accordingly. */ unsigned check_ptp(char *ifname) { unsigned ptp = 0; - if(!ifname) ifname = config.net.device; - if( ifname && ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.7/url.c new/linuxrc-5.0.8/url.c --- old/linuxrc-5.0.7/url.c 2014-07-25 18:13:49.000000000 +0200 +++ new/linuxrc-5.0.8/url.c 2014-07-31 10:28:30.000000000 +0200 @@ -2290,7 +2290,7 @@ if((config.net.do_setup & DS_SETUP)) auto2_user_netconfig(); if(!config.ifcfg.if_up) { - check_ptp(NULL); + check_ptp(config.ifcfg.manual->device); if(config.ifcfg.manual->dhcp && !config.ifcfg.manual->ptp) { net_dhcp(); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org