diff options
author | Saul Wold <sgw@linux.intel.com> | 2014-11-24 07:37:52 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-03 12:23:58 +0000 |
commit | 35e0a3eb6725781eb291b3fa90694a68c3b64c60 (patch) | |
tree | ce329ed9b3d7bf05bde05e231bc29380d2fe52e9 /meta/recipes-connectivity/resolvconf/resolvconf | |
parent | bc9adc175b63ff6cb4f06b0c80edc777c126d90c (diff) | |
download | poky-35e0a3eb6725781eb291b3fa90694a68c3b64c60.tar.gz |
resolvconf: add fixes for busybox and make it work
resolvconf was missing a script and needed readlink which was in
/usr/bin. Also the /etc/resolv.conf was not being correctly linked
to /etc/resolvconf/run/resolv.conf, which is fixed by the volaties
change which is now a file as opposed to created in do_install.
Ensure that the correct scripts for ifup/ifdown get installed and that
resolvconf is correctly enabled at startup
[YOCTO #5361]
(From OE-Core rev: 853e8d2c7aff6dddc1d555af22f54c4ecef13df1)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/resolvconf/resolvconf')
-rw-r--r-- | meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf | 4 | ||||
-rw-r--r-- | meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch | 20 |
2 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf b/meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf new file mode 100644 index 0000000000..3790d774a7 --- /dev/null +++ b/meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf | |||
@@ -0,0 +1,4 @@ | |||
1 | d root root 0755 /var/run/resolvconf/interface none | ||
2 | f root root 0644 /etc/resolvconf/run/resolv.conf none | ||
3 | f root root 0644 /etc/resolvconf/run/enable-updates none | ||
4 | l root root 0644 /etc/resolv.conf /etc/resolvconf/run/resolv.conf | ||
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch b/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch new file mode 100644 index 0000000000..1aead07869 --- /dev/null +++ b/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | |||
2 | busybox installs readlink into /usr/bin, so ensure /usr/bin | ||
3 | is in the path. | ||
4 | |||
5 | Upstream-Status: Submitted | ||
6 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
7 | |||
8 | Index: resolvconf-1.76/etc/resolvconf/update.d/libc | ||
9 | =================================================================== | ||
10 | --- resolvconf-1.76.orig/etc/resolvconf/update.d/libc | ||
11 | +++ resolvconf-1.76/etc/resolvconf/update.d/libc | ||
12 | @@ -16,7 +16,7 @@ | ||
13 | # | ||
14 | |||
15 | set -e | ||
16 | -PATH=/sbin:/bin | ||
17 | +PATH=/sbin:/bin:/usr/bin | ||
18 | |||
19 | [ -x /lib/resolvconf/list-records ] || exit 1 | ||
20 | |||