diff options
Diffstat (limited to 'package/base-files')
-rw-r--r-- | package/base-files/Makefile | 6 | ||||
-rw-r--r-- | package/base-files/files/profile (renamed from package/base-files/src/etc/profile) | 0 | ||||
-rwxr-xr-x | package/base-files/src/etc/init.d/rcS | 7 |
3 files changed, 9 insertions, 4 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index ae38dcb03..0ae4f795b 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:= 19 +PKG_RELEASE:= 20 PKG_SECTION:= base/apps PKG_DESCR:= basic files and scripts @@ -67,6 +67,7 @@ endif chmod 600 $(IDIR_BASE_FILES)/etc/shadow ifeq ($(ADK_TARGET_WITH_NETDEVICE),y) cp ./files/interfaces-dhcp $(IDIR_BASE_FILES)/etc/network/interfaces + cp ./files/rc.netinfo $(IDIR_BASE_FILES)/etc/ else cp ./files/interfaces-lo $(IDIR_BASE_FILES)/etc/network/interfaces endif @@ -108,6 +109,8 @@ endif $(SED) 's,\*NP\*,'"$$(awk -F\= '/^ADK_RUNTIME_PASSWORD/ { print $$2 }' $(ADK_TOPDIR)/.config|sed -e 's^\"^^g'),g" \ $(IDIR_BASE_FILES)/etc/shadow echo $(ADK_RUNTIME_TMPFS_SIZE) > $(IDIR_BASE_FILES)/etc/tmpfs +ifeq ($(ADK_PACKAGE_MKSH),y) + $(CP) ./files/profile $(IDIR_BASE_FILES)/etc/profile ifeq ($(ADK_TARGET_WITH_ROOT_RW),y) echo 'export IPKGTMPDIR=/root/.ipkg' >> $(IDIR_BASE_FILES)/etc/profile else @@ -116,6 +119,7 @@ endif ifeq ($(ADK_TARGET_BOARD_BCM28XX),y) echo 'export LD_LIBRARY_PATH=/opt/vc/lib' >> $(IDIR_BASE_FILES)/etc/profile endif +endif # simple network configuration ifneq (${ADK_SIMPLE_NETWORK_CONFIG},) diff --git a/package/base-files/src/etc/profile b/package/base-files/files/profile index eb3015d46..eb3015d46 100644 --- a/package/base-files/src/etc/profile +++ b/package/base-files/files/profile diff --git a/package/base-files/src/etc/init.d/rcS b/package/base-files/src/etc/init.d/rcS index 14fd3bc5d..4ca17abbc 100755 --- a/package/base-files/src/etc/init.d/rcS +++ b/package/base-files/src/etc/init.d/rcS @@ -73,7 +73,8 @@ fi done } |tee /dev/stderr |logger -p 6 -t '' -if [ $rcquiet -ne 1 ];then - ipaddr=$(ip addr show $(ip route show|awk '/default/ { print $5 }')|awk '/inet / { print $2 }'|tail -1) - echo "Your ip adress is $ipaddr" +if [ $rcquiet -ne 1 ]; then + if [ -f /etc/rc.netinfo ]; then + . /etc/rc.netinfo + fi fi |