Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2015-09-13 09:44:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-08-15 11:39:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2015-09-13 09:44:07.000000000 +0200 @@ -1,0 +2,19 @@ +Mon Sep 7 18:16:05 CEST 2015 - [email protected] + +- s390x: keep ssh active when selecting vnc (bsc#943744) +- 5.0.54 + +------------------------------------------------------------------- +Mon Sep 7 14:01:11 CEST 2015 - [email protected] + +- fix typo +- s390x: in install type dialog, make vnc & ssh mutually exclusive (bsc#943744) +- 5.0.53 + +------------------------------------------------------------------- +Wed Sep 2 10:21:11 CEST 2015 - [email protected] + +- s390x: treat virtio network device as 'normal' network device (bsc#943743) +- 5.0.52 + +------------------------------------------------------------------- Old: ---- linuxrc-5.0.51.tar.xz New: ---- linuxrc-5.0.54.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.Bk01px/_old 2015-09-13 09:44:08.000000000 +0200 +++ /var/tmp/diff_new_pack.Bk01px/_new 2015-09-13 09:44:08.000000000 +0200 @@ -25,7 +25,7 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 5.0.51 +Version: 5.0.54 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ linuxrc-5.0.51.tar.xz -> linuxrc-5.0.54.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.51/VERSION new/linuxrc-5.0.54/VERSION --- old/linuxrc-5.0.51/VERSION 2015-08-12 12:45:46.000000000 +0200 +++ new/linuxrc-5.0.54/VERSION 2015-09-07 18:14:10.000000000 +0200 @@ -1 +1 @@ -5.0.51 +5.0.54 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.51/changelog new/linuxrc-5.0.54/changelog --- old/linuxrc-5.0.51/changelog 2015-08-12 12:45:46.000000000 +0200 +++ new/linuxrc-5.0.54/changelog 2015-09-07 18:14:10.000000000 +0200 @@ -1,3 +1,13 @@ +2015-09-07: 5.0.54 + - s390x: keep ssh active when selecting vnc (bsc #943744) + +2015-09-07: 5.0.53 + - fix typo + - s390x: in install type dialog, make vnc & ssh mutually exclusive (bsc #943744) + +2015-09-01: 5.0.52 + - s390x: treat virtio network device as 'normal' network device (bsc #943743) + 2015-08-11: 5.0.51 - s390x: in kvm, don't ask for net device type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.51/install.c new/linuxrc-5.0.54/install.c --- old/linuxrc-5.0.51/install.c 2015-08-12 12:45:46.000000000 +0200 +++ new/linuxrc-5.0.54/install.c 2015-09-07 18:14:10.000000000 +0200 @@ -309,6 +309,7 @@ case di_display_ssh: config.usessh=1; + config.vnc=0; net_ask_password(); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.51/net.c new/linuxrc-5.0.54/net.c --- old/linuxrc-5.0.51/net.c 2015-08-12 12:45:46.000000000 +0200 +++ new/linuxrc-5.0.54/net.c 2015-09-07 18:14:10.000000000 +0200 @@ -50,6 +50,12 @@ #if defined(__s390__) || defined(__s390x__) +// settings for config.hwp.layer2 +// (layer2 attribute for network cards) +#define LAYER2_UNDEF 0 +#define LAYER2_NO 1 +#define LAYER2_YES 2 + int net_activate_s390_devs_ex(hd_t* hd, char** device); #endif @@ -150,7 +156,7 @@ if( config.net.setup & NS_DHCP && #if defined(__s390__) || defined(__s390x__) - config.hwp.layer2 - 1 && + config.hwp.layer2 != LAYER2_NO && #endif !config.ifcfg.manual->ptp ) { @@ -776,8 +782,17 @@ 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=2; } - else {config.hwp.layer2=1;} + // set the layer2 tag for network cards + // LAYER2_UNDEF means it doesn't have this attribute (e.g. virtio) + if(*type == 0) { + config.hwp.layer2 = LAYER2_UNDEF; + } + else if(*type == '1') { + config.hwp.layer2 = LAYER2_YES; + } + else { + config.hwp.layer2 = LAYER2_NO; + } } } #endif @@ -1509,9 +1524,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 ? LAYER2_YES : LAYER2_NO; } - if(config.hwp.layer2 == 2) { + if(config.hwp.layer2 == LAYER2_YES) { IFNOTAUTO(config.hwp.osahwaddr) { dia_input2("MAC address", &config.hwp.osahwaddr, 17, 1); } @@ -1535,6 +1550,7 @@ break; case di_390net_virtio: + config.hwp.layer2 = LAYER2_UNDEF; return 0; break; @@ -1581,7 +1597,7 @@ config.hwp.portname ? "-p \"" : "", config.hwp.portname ? config.hwp.portname : "", config.hwp.portname ? "\"" : "", - config.hwp.layer2 == 2 ? "-l" : "", + config.hwp.layer2 == LAYER2_YES ? "-l" : "", config.hwp.readchan, config.hwp.writechan, config.hwp.datachan); @@ -2299,7 +2315,7 @@ #if defined(__s390__) || defined(__s390x__) // s390 layer2 interfaces - if(config.hwp.layer2 == 2 && config.hwp.osahwaddr) { + if(config.hwp.layer2 == LAYER2_YES && config.hwp.osahwaddr) { char *sysfs_string = NULL; char *card_type;
