diff options
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-tmpfiles.d-etc.conf-disable-resolv.conf-symlink.patch | 35 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_216.bb | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-tmpfiles.d-etc.conf-disable-resolv.conf-symlink.patch b/meta/recipes-core/systemd/systemd/0001-tmpfiles.d-etc.conf-disable-resolv.conf-symlink.patch new file mode 100644 index 0000000000..7218322d4c --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-tmpfiles.d-etc.conf-disable-resolv.conf-symlink.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From f0ab1600fb56d680e6aba3d0d51dfb9ffa3d9403 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Peter A. Bigot" <pab@pabigot.com> | ||
3 | Date: Thu, 18 Sep 2014 08:36:54 -0500 | ||
4 | Subject: [PATCH] tmpfiles.d/etc.conf: disable resolv.conf symlink | ||
5 | |||
6 | This link is valid only if ENABLE_RESOLVED is configured for systemd. | ||
7 | If left unconditional, the symlink is created preventing connman from | ||
8 | storing the configuration it received from DHCP or other sources. | ||
9 | |||
10 | Upstream has a TODO to fix this, but has not done so as of this date. | ||
11 | Provide a temporary workaround for OE until this is done properly | ||
12 | upstream. | ||
13 | |||
14 | Upstream-Status: Inappropriate [OE-specific] | ||
15 | Signed-off-by: Peter A. Bigot <pab@pabigot.com> | ||
16 | --- | ||
17 | tmpfiles.d/etc.conf | 3 ++- | ||
18 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/tmpfiles.d/etc.conf b/tmpfiles.d/etc.conf | ||
21 | index b23272c..5364dd8 100644 | ||
22 | --- a/tmpfiles.d/etc.conf | ||
23 | +++ b/tmpfiles.d/etc.conf | ||
24 | @@ -10,6 +10,7 @@ | ||
25 | L /etc/os-release - - - - ../usr/lib/os-release | ||
26 | L /etc/localtime - - - - ../usr/share/zoneinfo/UTC | ||
27 | L+ /etc/mtab - - - - ../proc/self/mounts | ||
28 | -L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf | ||
29 | +# TODO: conditional on ENABLE_RESOLVED | ||
30 | +#L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf | ||
31 | C /etc/nsswitch.conf - - - - | ||
32 | C /etc/pam.d - - - - | ||
33 | -- | ||
34 | 1.8.5.5 | ||
35 | |||
diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_216.bb index 331da99479..ebf939574d 100644 --- a/meta/recipes-core/systemd/systemd_216.bb +++ b/meta/recipes-core/systemd/systemd_216.bb | |||
@@ -36,6 +36,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol= | |||
36 | file://00-create-volatile.conf \ | 36 | file://00-create-volatile.conf \ |
37 | file://init \ | 37 | file://init \ |
38 | file://run-ptest \ | 38 | file://run-ptest \ |
39 | ${@bb.utils.contains('PACKAGECONFIG', 'resolved', '', 'file://0001-tmpfiles.d-etc.conf-disable-resolv.conf-symlink.patch', d)} \ | ||
39 | " | 40 | " |
40 | 41 | ||
41 | S = "${WORKDIR}/git" | 42 | S = "${WORKDIR}/git" |