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:22:40 +0000 |
| commit | 853e8d2c7aff6dddc1d555af22f54c4ecef13df1 (patch) | |
| tree | 9e071bc199554e8fdfbf2e8ab835bcfb95484a4c /meta/recipes-connectivity/resolvconf/resolvconf | |
| parent | 73f418ce10a801f0befc06ffe54864563aea986c (diff) | |
| download | openembedded-core-contrib-853e8d2c7aff6dddc1d555af22f54c4ecef13df1.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]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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 @@ +d root root 0755 /var/run/resolvconf/interface none +f root root 0644 /etc/resolvconf/run/resolv.conf none +f root root 0644 /etc/resolvconf/run/enable-updates none +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 @@ + +busybox installs readlink into /usr/bin, so ensure /usr/bin +is in the path. + +Upstream-Status: Submitted +Signed-off-by: Saul Wold <sgw@linux.intel.com> + +Index: resolvconf-1.76/etc/resolvconf/update.d/libc +=================================================================== +--- resolvconf-1.76.orig/etc/resolvconf/update.d/libc ++++ resolvconf-1.76/etc/resolvconf/update.d/libc +@@ -16,7 +16,7 @@ + # + + set -e +-PATH=/sbin:/bin ++PATH=/sbin:/bin:/usr/bin + + [ -x /lib/resolvconf/list-records ] || exit 1 + |