diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-24 17:51:23 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-24 17:51:23 +0100 |
| commit | 15c95156cc3de045d78ff58bd0ca926eb5acdcd7 (patch) | |
| tree | 86a7490ffccbe32c7f64e2e1dcd59a16d21f58fd /mk/image.mk | |
| parent | 19692dacc3545ad56305817024e97524d4504377 (diff) | |
fix when overwrite via extra dir
Diffstat (limited to 'mk/image.mk')
| -rw-r--r-- | mk/image.mk | 3 |
1 files changed, 3 insertions, 0 deletions
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 |