|
 |
33cfa9 |
From ddf02f21504708956b586988d797f2b23b53a950 Mon Sep 17 00:00:00 2001
|
|
|
33cfa9 |
From: Marius Vollmer <mvollmer@redhat.com>
|
|
|
33cfa9 |
Date: Thu, 3 Nov 2016 14:49:41 +0200
|
|
|
33cfa9 |
Subject: [4/7] networkmanager: Not all connections have a interface name
|
|
|
33cfa9 |
|
|
|
33cfa9 |
https://bugzilla.redhat.com/show_bug.cgi?id=1394668
|
|
|
33cfa9 |
|
|
|
33cfa9 |
Upstream commit:
|
|
|
33cfa9 |
5d3f012faf468235954083312b1bd15ac8fc29c8
|
|
|
33cfa9 |
networkmanager: Not all connections have a interface name
|
|
|
33cfa9 |
|
|
|
33cfa9 |
Closes #5363
|
|
|
33cfa9 |
Signed-off-by: Stef Walter <stefw@redhat.com>
|
|
|
33cfa9 |
* Signing off inclusion in the rhel-7.3.1 branch
|
|
|
33cfa9 |
---
|
|
|
33cfa9 |
dist/networkmanager/network.js | Bin 132973 -> 132976 bytes
|
|
|
33cfa9 |
dist/networkmanager/network.js.map | Bin 1029014 -> 1029108 bytes
|
|
|
33cfa9 |
pkg/networkmanager/interfaces.js | 3 ++-
|
|
|
33cfa9 |
3 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
33cfa9 |
|
|
|
33cfa9 |
diff --git a/dist/networkmanager/network.js b/dist/networkmanager/network.js
|
|
|
33cfa9 |
index ac346740af42b474d67e169402a8147b6a46708f..a5a1dba5cda0e4bc50df99453862cb89a8a605d6 100644
|
|
|
33cfa9 |
GIT binary patch
|
|
|
33cfa9 |
delta 22
|
|
|
33cfa9 |
ecmaFc$MK<$W5Xsh<`Olv=1peXH<>Z+z5oDpuL=7A
|
|
|
33cfa9 |
|
|
|
33cfa9 |
delta 18
|
|
|
33cfa9 |
acmey+$MLq0W5Xu1=B;Mix0*5Tz5oDOq6t0#
|
|
|
33cfa9 |
|
|
|
33cfa9 |
diff --git a/dist/networkmanager/network.js.map b/dist/networkmanager/network.js.map
|
|
|
33cfa9 |
index dc53b3f715bd55e48472b2325ddf21fa1d556ee4..1b98808a10590f95af3df971bff95aef471d6f95 100644
|
|
|
33cfa9 |
GIT binary patch
|
|
|
33cfa9 |
delta 549
|
|
|
33cfa9 |
zcmbRC-0sVBy9u!(iD_m@Nl9tOMv2MBiAfe_MoA{g8w-n@867v@Z?2bT)Sn!`cqL=y
|
|
|
33cfa9 |
zX3iyP?Tk6o3$z)<+{%kReRYBz9fR|VoOE0r9Rpo-+&wFbJ
|
|
|
33cfa9 |
zWdT>}1yu=D5bUAj?rpjKj5edWq-<#k)Ucc~m|;*Qz8MwU6
|
|
|
33cfa9 |
zD$94eqAR2R_V`N1o8tAE*}kai+ye^={7{{xW8oZRP~Znq2X-&W`N4)5>e7pyLedM-
|
|
|
33cfa9 |
z6^3RMq8nK07gh{bCj#^u%tWXk!b`TFp2)aEQbrqQQiUO!HzN(V&tJ{x`
|
|
|
33cfa9 |
z*Vj)kU}0fl&P&XlUTDH1HGP2%Gtcybf1En)AHtY{m<5PgftU@5*@2j2`-d>jOYB%9
|
|
|
33cfa9 |
za(a&_PtbJlbxeZW-;44rX4-xyk#ou%umvnY3sR?l^yg7-2O18
|
|
|
33cfa9 |
HpW0RcK1jBT
|
|
|
33cfa9 |
|
|
|
33cfa9 |
delta 522
|
|
|
33cfa9 |
zcmezJ+-}-)y9u!(X2wZoMuvu_7KVmqmd1w3sTRp58w-n@H@|AGl4rD>oVs`=WBF$O
|
|
|
33cfa9 |
zC28%kS;d}ZPR=^6j*gBlI)OkkzsN}^(4(~2(^n_h(J?p=$OTFUy6CujmSL#%(h2r5
|
|
|
33cfa9 |
zgDdrdssySJ_Rw+nHs5|po6%g7v3NR{E29*Xe))DaSH>^KGNlz>5W^i&HTYL#`A%1N
|
|
|
33cfa9 |
zWz^rETFH1*ygohK7ge2mU|xYAs&jQLoP#P0{2=PU{s1{OxC%pEda+Z8Hip7beGG+_
|
|
|
33cfa9 |
zeqn`$AOl5!-hi11^-_4z_KOo4cStf?Oz&FFD8*Q{ed%gO-`|Yc+dnU3y1st;xqqBG
|
|
|
33cfa9 |
z(^ptBOHDUO
|
|
|
33cfa9 |
ym}C3Oa84g~tZ_KKAedKdni!AG_UL#{kNNFD>wuUGh`E872Z(vMpZmwBwiN*KRIJJX
|
|
|
33cfa9 |
|
|
|
33cfa9 |
diff --git a/pkg/networkmanager/interfaces.js b/pkg/networkmanager/interfaces.js
|
|
|
33cfa9 |
index fa95d9c..4d0a751 100644
|
|
|
33cfa9 |
--- a/pkg/networkmanager/interfaces.js
|
|
|
33cfa9 |
+++ b/pkg/networkmanager/interfaces.js
|
|
|
33cfa9 |
@@ -1160,7 +1160,8 @@ function NetworkManagerModel() {
|
|
|
33cfa9 |
if (obj.Connections) {
|
|
|
33cfa9 |
obj.Connections.forEach(function (con) {
|
|
|
33cfa9 |
function add_to_interface(name) {
|
|
|
33cfa9 |
- get_interface(name).Connections.push(con);
|
|
|
33cfa9 |
+ if (name)
|
|
|
33cfa9 |
+ get_interface(name).Connections.push(con);
|
|
|
33cfa9 |
}
|
|
|
33cfa9 |
|
|
|
33cfa9 |
if (con.Settings) {
|
|
|
33cfa9 |
--
|
|
|
33cfa9 |
2.5.5
|
|
|
33cfa9 |
|