summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Bonnans <laurent.bonnans@here.com>2019-07-31 18:21:02 +0200
committerLaurent Bonnans <laurent.bonnans@here.com>2019-08-01 14:08:03 +0200
commit3dad9dfb5c2fed58a9524a383165dda5a140fc7a (patch)
tree307cd4cae71d791a93084aa66387c821c6f82b75
parente4dd74565f429b576e84972d12cc1ae2048be119 (diff)
downloadmeta-updater-3dad9dfb5c2fed58a9524a383165dda5a140fc7a.tar.gz
Do not create connman's resolv.conf symlink at boot
Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
-rw-r--r--recipes-connectivity/connman/connman_%.bbappend5
-rw-r--r--recipes-connectivity/connman/files/0001-tmpfiles-script-do-not-create-the-resolv.conf-symlin.patch22
2 files changed, 27 insertions, 0 deletions
diff --git a/recipes-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend
index b3633cc..08ec832 100644
--- a/recipes-connectivity/connman/connman_%.bbappend
+++ b/recipes-connectivity/connman/connman_%.bbappend
@@ -1 +1,6 @@
1RPROVIDES_${PN} += "virtual/network-configuration" 1RPROVIDES_${PN} += "virtual/network-configuration"
2
3# patch to not create the resolv.conf symlink at run-time, as it's already
4# handled in the recipe and messes up with ostree
5FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
6SRC_URI += "file://0001-tmpfiles-script-do-not-create-the-resolv.conf-symlin.patch"
diff --git a/recipes-connectivity/connman/files/0001-tmpfiles-script-do-not-create-the-resolv.conf-symlin.patch b/recipes-connectivity/connman/files/0001-tmpfiles-script-do-not-create-the-resolv.conf-symlin.patch
new file mode 100644
index 0000000..9b4a78c
--- /dev/null
+++ b/recipes-connectivity/connman/files/0001-tmpfiles-script-do-not-create-the-resolv.conf-symlin.patch
@@ -0,0 +1,22 @@
1From 9e724a61f015304c9d72d829a66178d20e3fa980 Mon Sep 17 00:00:00 2001
2From: Laurent Bonnans <laurent.bonnans@here.com>
3Date: Wed, 31 Jul 2019 18:15:47 +0200
4Subject: [PATCH] tmpfiles script: do not create the resolv.conf symlink
5
6It's handled by yocto in our case
7
8Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
9---
10 scripts/connman_resolvconf.conf.in | 1 -
11 1 file changed, 1 deletion(-)
12
13diff --git a/scripts/connman_resolvconf.conf.in b/scripts/connman_resolvconf.conf.in
14index 2d61dfe1..8a7d3071 100644
15--- a/scripts/connman_resolvconf.conf.in
16+++ b/scripts/connman_resolvconf.conf.in
17@@ -1,2 +1 @@
18 d @runstatedir@/connman - - - -
19-L+ /etc/resolv.conf - - - - @runstatedir@/connman/resolv.conf
20--
212.20.1
22