summaryrefslogtreecommitdiff
path: root/package/base-files
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-12-06 17:27:53 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2015-12-06 17:28:14 +0100
commit037b34bcedfa2a3922fc28a6b9cb9cd594b5a7fa (patch)
tree7f68835d79dfdda6fc4819797cf992c060fdc694 /package/base-files
parentd98de8381697e85bf887d02332d08c2583b820e3 (diff)
fix nfsroot interfaces, network is already configured
Diffstat (limited to 'package/base-files')
-rw-r--r--package/base-files/Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 4af49a6e1..ae38dcb03 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/mk/rootfs.mk
PKG_NAME:= base-files
PKG_VERSION:= 1.1
-PKG_RELEASE:= 18
+PKG_RELEASE:= 19
PKG_SECTION:= base/apps
PKG_DESCR:= basic files and scripts
@@ -28,9 +28,6 @@ ifeq ($(ADK_RUNTIME_DEV_MDEV),y)
else ifeq ($(ADK_RUNTIME_DEV_UDEV),y)
$(CP) ./files/rcdev.udev $(IDIR_BASE_FILES)/etc/init.d/rcdev
endif
-ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y)
- @echo "#" > $(IDIR_BASE_FILES)/etc/network/interfaces
-endif
ifeq (${ADK_TARGET_PACKAGE_IPKG},y)
$(CP) ./files/ipkg.conf $(IDIR_BASE_FILES)/etc/
$(SED) 's,@ARCH@,$(ADK_TARGET_CPU_ARCH),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
@@ -75,6 +72,7 @@ else
endif
chmod 600 $(IDIR_BASE_FILES)/etc/network/interfaces
ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y)
+ echo '#' > $(IDIR_BASE_FILES)/etc/network/interfaces
(cd $(IDIR_BASE_FILES)/etc; ln -sf ../proc/net/pnp resolv.conf)
else
(cd $(IDIR_BASE_FILES)/etc; ln -sf ../tmp/resolv.conf .)