diff options
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rw-r--r-- | package/base-files/extra/etc/mdev.conf | 2 | ||||
| -rwxr-xr-x | package/base-files/extra/init | 8 | ||||
| -rw-r--r-- | target/native/files/etc/mdev.conf | 2 | ||||
| -rw-r--r-- | target/qemu-cris/files/etc/mdev.conf | 2 | ||||
| -rw-r--r-- | target/rescue-x86/files/etc/mdev.conf | 2 | ||||
| -rw-r--r-- | target/rescue-x86_64/files/etc/mdev.conf | 2 | ||||
| -rw-r--r-- | target/shuttle/files/etc/mdev.conf | 2 | ||||
| -rw-r--r-- | target/shuttle/files/etc/notmpfs | 0 |
9 files changed, 12 insertions, 10 deletions
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 diff --git a/target/native/files/etc/mdev.conf b/target/native/files/etc/mdev.conf index 82171d8ed..363d02262 100644 --- a/target/native/files/etc/mdev.conf +++ b/target/native/files/etc/mdev.conf @@ -9,6 +9,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/target/qemu-cris/files/etc/mdev.conf b/target/qemu-cris/files/etc/mdev.conf index 2b58560be..64ad18f62 100644 --- a/target/qemu-cris/files/etc/mdev.conf +++ b/target/qemu-cris/files/etc/mdev.conf @@ -8,6 +8,6 @@ kmem 0:9 000 mem 0:9 0640 port 0:9 0640 ptmx 0:5 666 -tty 0:5 0660 +tty 0:0 0666 ttyS* 0:20 640 .* 0:0 644 @/lib/mdev/init diff --git a/target/rescue-x86/files/etc/mdev.conf b/target/rescue-x86/files/etc/mdev.conf index 82171d8ed..363d02262 100644 --- a/target/rescue-x86/files/etc/mdev.conf +++ b/target/rescue-x86/files/etc/mdev.conf @@ -9,6 +9,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/target/rescue-x86_64/files/etc/mdev.conf b/target/rescue-x86_64/files/etc/mdev.conf index 82171d8ed..363d02262 100644 --- a/target/rescue-x86_64/files/etc/mdev.conf +++ b/target/rescue-x86_64/files/etc/mdev.conf @@ -9,6 +9,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/target/shuttle/files/etc/mdev.conf b/target/shuttle/files/etc/mdev.conf index 82171d8ed..363d02262 100644 --- a/target/shuttle/files/etc/mdev.conf +++ b/target/shuttle/files/etc/mdev.conf @@ -9,6 +9,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/target/shuttle/files/etc/notmpfs b/target/shuttle/files/etc/notmpfs new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/target/shuttle/files/etc/notmpfs |