From 107e95cd028c183f73705bf04a5dc2b99fa1c258 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 17 Sep 2009 19:19:28 +0200
Subject: add a method to avoid /tmp as tmpfs

- useful f.e. for a shuttle pc
- fix tty permissions, needed for non-root users
---
 package/base-files/Makefile            | 2 +-
 package/base-files/extra/etc/mdev.conf | 2 +-
 package/base-files/extra/init          | 8 +++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'package/base-files')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 213895e96..52130bf10 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:=		5
+PKG_RELEASE:=		6
 PKG_DESCR:=		basic filesystem structure and scripts
 PKG_SECTION:=		base
 
diff --git a/package/base-files/extra/etc/mdev.conf b/package/base-files/extra/etc/mdev.conf
index 61b818523..99c910d0b 100644
--- a/package/base-files/extra/etc/mdev.conf
+++ b/package/base-files/extra/etc/mdev.conf
@@ -6,6 +6,6 @@ kmem 0:0 000
 mem 0:0 0640
 port 0:0 0640
 ptmx 0:0 666
-tty 0:0 0660
+tty 0:0 0666
 ttyS* 0:0 640
 .* 0:0 644 @/lib/mdev/init
diff --git a/package/base-files/extra/init b/package/base-files/extra/init
index 4b4e90213..9013065d0 100755
--- a/package/base-files/extra/init
+++ b/package/base-files/extra/init
@@ -2,10 +2,12 @@
 echo "Pre-boot initializing"
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 mount -nt proc proc /proc
-size=$(awk '/MemTotal:/ { if ($2 > 16000) { print 4096 } else { print 2048 }}' /proc/meminfo)
 mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
-mount none /tmp -t tmpfs -o size=${size}k
-mount none /tmp -t tmpfs -o remount,nosuid,nodev,mode=1777
+[ ! -f /etc/notmpfs ] && {
+	size=$(awk '/MemTotal:/ { if ($2 > 16000) { print 4096 } else { print 2048 }}' /proc/meminfo)
+	mount none /tmp -t tmpfs -o size=${size}k
+	mount none /tmp -t tmpfs -o remount,nosuid,nodev,mode=1777
+}
 mount -o nosuid,size=64k,mode=0755 -t tmpfs mdev /dev
 mkdir /dev/pts /dev/shm
 mount -o nosuid,noexec -t devpts devpts /dev/pts
-- 
cgit v1.2.3