Hello community,
here is the log from the commit of package linuxrc for openSUSE:Factory checked
in at 2018-03-29 11:50:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linuxrc (Old)
and /work/SRC/openSUSE:Factory/.linuxrc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc"
Thu Mar 29 11:50:35 2018 rev:257 rq:590985 version:5.1.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2018-03-16
10:35:44.736900011 +0100
+++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2018-03-29
11:50:37.197173549 +0200
@@ -1,0 +2,8 @@
+Mon Mar 26 08:40:12 UTC 2018 - opensuse-packag...@opensuse.org
+
+- merge gh#openSUSE/linuxrc#166
+- Fix for bsc#1085860 Change chzdev call to conform to documented
+ syntax
+- 5.1.8
+
+--------------------------------------------------------------------
Old:
----
linuxrc-5.1.7.tar.xz
New:
----
linuxrc-5.1.8.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.QCrk2p/_old 2018-03-29 11:50:37.753153525 +0200
+++ /var/tmp/diff_new_pack.QCrk2p/_new 2018-03-29 11:50:37.753153525 +0200
@@ -17,7 +17,7 @@
Name: linuxrc
-Version: 5.1.7
+Version: 5.1.8
Release: 0
Summary: SUSE Installation Program
License: GPL-3.0+
++++++ linuxrc-5.1.7.tar.xz -> linuxrc-5.1.8.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.1.7/VERSION new/linuxrc-5.1.8/VERSION
--- old/linuxrc-5.1.7/VERSION 2018-03-15 14:49:25.000000000 +0100
+++ new/linuxrc-5.1.8/VERSION 2018-03-26 10:40:12.000000000 +0200
@@ -1 +1 @@
-5.1.7
+5.1.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.1.7/changelog new/linuxrc-5.1.8/changelog
--- old/linuxrc-5.1.7/changelog 2018-03-15 14:49:25.000000000 +0100
+++ new/linuxrc-5.1.8/changelog 2018-03-26 10:40:12.000000000 +0200
@@ -1,3 +1,8 @@
+2018-03-26: 5.1.8
+ - merge gh#openSUSE/linuxrc#166
+ - Fix for bsc#1085860 Change chzdev call to conform to documented
+ syntax
+
2018-03-15: 5.1.7
- merge gh#openSUSE/linuxrc#165
- be carefull with 'kexec -s', it's not always available (bsc#1076839)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.1.7/net.c new/linuxrc-5.1.8/net.c
--- old/linuxrc-5.1.7/net.c 2018-03-15 14:49:25.000000000 +0100
+++ new/linuxrc-5.1.8/net.c 2018-03-26 10:40:12.000000000 +0200
@@ -1595,24 +1595,30 @@
break;
case di_390net_ctc:
case di_390net_escon:
-setup_ctc:
if(config.hwp.protocol > 0)
- sprintf(cmd, "/sbin/chzdev -e ctc --no-root-update %s:%s protocol=%d",
config.hwp.readchan, config.hwp.writechan, config.hwp.protocol - 1);
+ sprintf(cmd, "/sbin/chzdev -e ctc --no-root-update %s-%s protocol=%d",
config.hwp.readchan, config.hwp.writechan, config.hwp.protocol - 1);
else
- sprintf(cmd, "/sbin/chzdev -e ctc --no-root-update %s %s",
config.hwp.readchan, config.hwp.writechan);
+ sprintf(cmd, "/sbin/chzdev -e ctc --no-root-update %s-%s",
config.hwp.readchan, config.hwp.writechan);
break;
case di_390net_hsi:
case di_390net_osa:
- if (config.hwp.interface == di_osa_lcs)
- goto setup_ctc;
- ccmd += sprintf(ccmd, "/sbin/chzdev -e qeth --no-root-update ");
- if(config.hwp.portno)
- ccmd += sprintf(ccmd, "portno=%d ", config.hwp.portno - 1);
- ccmd += sprintf(ccmd, "%s %s:%s:%s ",
+ if (config.hwp.interface == di_osa_lcs) {
+ sprintf(cmd, "/sbin/chzdev -e lcs --no-root-update %s-%s",
config.hwp.readchan, config.hwp.writechan);
+ /* For whatever reason, LCS devices need to be enabled twice before
they
+ * actually come online. So, we execute lxrc_run here, and again
after the end
+ * of the case statement. */
+ rc = lxrc_run(cmd);
+ }
+ else {
+ ccmd += sprintf(ccmd, "/sbin/chzdev -e qeth --no-root-update ");
+ if(config.hwp.portno)
+ ccmd += sprintf(ccmd, "portno=%d ", config.hwp.portno - 1);
+ ccmd += sprintf(ccmd, "%s %s:%s:%s ",
config.hwp.layer2 == LAYER2_YES ? "layer2=1 " : "layer2=0 ",
config.hwp.readchan,
config.hwp.writechan,
config.hwp.datachan);
+ }
break;
default:
sprintf(cmd, "unknown s390 network type %d", config.hwp.type);
