From 6cdfd44c19355db5f52bf27e7ef98329026b3344 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Fri, 31 May 2019 14:58:32 +0200 Subject: connman: refresh patch against 1.37 Signed-off-by: Max Krummenacher --- .../connman/0002-main.conf-blacklist-rndis-nic-s.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/recipes-connectivity/connman/connman/0002-main.conf-blacklist-rndis-nic-s.patch b/recipes-connectivity/connman/connman/0002-main.conf-blacklist-rndis-nic-s.patch index e435ac0..dd6bafa 100644 --- a/recipes-connectivity/connman/connman/0002-main.conf-blacklist-rndis-nic-s.patch +++ b/recipes-connectivity/connman/connman/0002-main.conf-blacklist-rndis-nic-s.patch @@ -1,7 +1,7 @@ -From 7e374263fe2b0cb884b94849d7def3893175beb0 Mon Sep 17 00:00:00 2001 +From 38a7afa59f0edc1e4c6a49e778e6456f6cd30446 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Fri, 30 Dec 2016 13:41:47 +0100 -Subject: [PATCH 2/3] main.conf: blacklist rndis nic's +Subject: [PATCH 2/2] main.conf: blacklist rndis nic's We want them handled by systemd's networkd. @@ -11,18 +11,18 @@ Signed-off-by: Max Krummenacher 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.conf b/src/main.conf -index acceda3..68528d9 100644 +index 14965e1..d7b2951 100644 --- a/src/main.conf +++ b/src/main.conf -@@ -58,7 +58,7 @@ - # not be handled by connman, if their first characters +@@ -67,7 +67,7 @@ + # not be handled by ConnMan, if their first characters # match any of the list entries. Default value is # vmnet,vboxnet,virbr,ifb,ve-,vb-. -# NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb,ve-,vb- +NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb,ve-,vb-,usb,rndis - # Allow connman to change the system hostname. This can + # Allow ConnMan to change the system hostname. This can # happen for example if we receive DHCP hostname option. -- -2.6.6 +2.13.6 -- cgit v1.2.3