diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-09-26 09:43:33 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-09-26 09:43:33 +0200 |
| commit | b90cc7f1ad47a02d811f45b1b6fa0c5fc5bf0edf (patch) | |
| tree | 74a7f0dcea7f3c1c9e4d4edbfa8f52b2d2f38321 /package/base-files/extra | |
| parent | 418f934071ec5fc3afc1540df2c2ed27b676f306 (diff) | |
| parent | bb813d480b00ed42f1e59b760b6433f4ad96bcde (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/base-files/extra')
| -rw-r--r-- | package/base-files/extra/etc/group | 1 | ||||
| -rw-r--r-- | package/base-files/extra/etc/mdev.conf | 2 | ||||
| -rw-r--r-- | package/base-files/extra/etc/passwd | 1 | ||||
| -rwxr-xr-x | package/base-files/extra/init | 8 |
4 files changed, 6 insertions, 6 deletions
diff --git a/package/base-files/extra/etc/group b/package/base-files/extra/etc/group index 1f444a8bf..c4e77f316 100644 --- a/package/base-files/extra/etc/group +++ b/package/base-files/extra/etc/group @@ -1,3 +1,2 @@ root:x:0: -admin:x:100: nogroup:x:65534: 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/etc/passwd b/package/base-files/extra/etc/passwd index 87eee84af..32531eb92 100644 --- a/package/base-files/extra/etc/passwd +++ b/package/base-files/extra/etc/passwd @@ -1,3 +1,2 @@ root:x:0:0:root:/root:/bin/sh -admin:x:100:100:admin:/tmp:/bin/sh nobody:*:65534:65534:nobody:/var:/bin/false 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 |