diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-20 11:33:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-20 11:33:29 +0200 |
| commit | 7310c677852c7a925c55922481052ad0ff7c8310 (patch) | |
| tree | 275ec74ed3c4cd35a4ebe5eadc6afb24026de254 | |
| parent | 613d9ef98b6a95890f4ea56b921f9047670fe2d1 (diff) | |
make tmpfs size configurable via /etc/tmpfs
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files/src/init | 3 | ||||
| -rw-r--r-- | target/lemote/Makefile | 1 | ||||
| -rw-r--r-- | target/lemote/files/etc/tmpfs | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 3f63df3e6..34807d6a0 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 10 +PKG_RELEASE:= 11 PKG_DESCR:= basic filesystem structure and scripts PKG_SECTION:= base diff --git a/package/base-files/src/init b/package/base-files/src/init index 618547693..173e91b0b 100755 --- a/package/base-files/src/init +++ b/package/base-files/src/init @@ -4,7 +4,8 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin mount -nt proc proc /proc mount -o nosuid,nodev,noexec -t sysfs sysfs /sys [ ! -f /etc/notmpfs ] && { - size=$(awk '/MemTotal:/ { if ($2 > 16000) { print 4096 } else { print 2048 }}' /proc/meminfo) + size=2048 + size=$(cat /etc/tmpfs 2>/dev/null) mount none /tmp -t tmpfs -o size=${size}k mount none /tmp -t tmpfs -o remount,nosuid,nodev,mode=1777 } diff --git a/target/lemote/Makefile b/target/lemote/Makefile index d79f1e270..8f8042827 100644 --- a/target/lemote/Makefile +++ b/target/lemote/Makefile @@ -24,6 +24,7 @@ createinitcrypt: ifeq ($(FS),nfsroot) imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) + @cp $(LINUX_DIR)/vmlinuz $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}' @echo 'Boot your lemote and type following commands in PMON:' diff --git a/target/lemote/files/etc/tmpfs b/target/lemote/files/etc/tmpfs new file mode 100644 index 000000000..08558e471 --- /dev/null +++ b/target/lemote/files/etc/tmpfs @@ -0,0 +1 @@ +16384 |