From 15c95156cc3de045d78ff58bd0ca926eb5acdcd7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 24 Mar 2014 17:51:23 +0100 Subject: fix when overwrite via extra dir --- mk/image.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mk/image.mk') diff --git a/mk/image.mk b/mk/image.mk index 1e7a802a5..9de733ef8 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -34,6 +34,9 @@ imageprepare: image-prepare-post extra-install # if an extra directory exist in TOPDIR, copy all content over the # root directory, do the same if make extra=/dir/to/extra is used extra-install: + @-if [ -h ${TARGET_DIR}/etc/resolv.conf -a -f $(TOPDIR)/extra/etc/resolv.conf ];then \ + rm ${TARGET_DIR}/etc/resolv.conf;\ + fi @if [ -d $(TOPDIR)/extra ];then $(CP) $(TOPDIR)/extra/* ${TARGET_DIR};fi @if [ ! -z $(extra) ];then $(CP) $(extra)/* ${TARGET_DIR};fi -- cgit v1.2.3