diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-25 12:06:04 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-25 12:06:04 +0100 |
| commit | 707203cd87cfc8c25313ee021f1e52f7ab1fdd61 (patch) | |
| tree | f2a270bd86eaae0c788294ac8d21d85c9c6e3460 /mk/image.mk | |
| parent | 46af98aa4327633d1509d728b3b85e0a4da39c9b (diff) | |
| parent | 6688b85c468752dfd985dd763d9b28788fe6806b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
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 b607249cd..6a4d7863d 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 |