diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-12 21:10:52 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-12 21:10:52 +0200 |
| commit | 681a668edf704bbb000a49c835b3d71fa7035d86 (patch) | |
| tree | 27df7d51e37260f63812466b31369c1a144cdc45 /package/base-files/src | |
| parent | 2d1f73d4334593134d3a47704a2614ffcae384ae (diff) | |
| parent | 6c2bc15eb5c40548f6a98c37ab0b825b9c163343 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/base-files/src')
| -rw-r--r-- | package/base-files/src/etc/group | 2 | ||||
| -rw-r--r-- | package/base-files/src/etc/hosts | 2 | ||||
| -rw-r--r-- | package/base-files/src/etc/mdev.conf | 2 | ||||
| -rwxr-xr-x | package/base-files/src/init | 4 | ||||
| -rwxr-xr-x | package/base-files/src/sbin/adkupdate | 8 |
5 files changed, 14 insertions, 4 deletions
diff --git a/package/base-files/src/etc/group b/package/base-files/src/etc/group index c4e77f316..bbf6c0603 100644 --- a/package/base-files/src/etc/group +++ b/package/base-files/src/etc/group @@ -1,2 +1,4 @@ root:x:0: +video:x:1: +audio:x:2: nogroup:x:65534: diff --git a/package/base-files/src/etc/hosts b/package/base-files/src/etc/hosts deleted file mode 100644 index 085363292..000000000 --- a/package/base-files/src/etc/hosts +++ /dev/null @@ -1,2 +0,0 @@ -::1 localhost -127.0.0.1 localhost diff --git a/package/base-files/src/etc/mdev.conf b/package/base-files/src/etc/mdev.conf index 173a851f3..4cc06251a 100644 --- a/package/base-files/src/etc/mdev.conf +++ b/package/base-files/src/etc/mdev.conf @@ -9,7 +9,7 @@ ttyS* 0:0 640 rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc device-mapper 0:0 660 @test -d /dev/mapper || mkdir /dev/mapper tun 0:0 660 >net/tun -fb? root:video 660 +fb0 root:video 660 audio root:audio 660 >snd/audio dsp root:audio 660 >snd/dsp timer root:audio 660 >snd/timer diff --git a/package/base-files/src/init b/package/base-files/src/init index a3232cb9c..c57149fe3 100755 --- a/package/base-files/src/init +++ b/package/base-files/src/init @@ -1,7 +1,7 @@ #!/bin/sh echo "System initialization ..." export PATH=/bin:/sbin:/usr/bin:/usr/sbin -mount -t devtmpfs devtmpfs /dev > /dev/null 2>&1 +mount -t devtmpfs devtmpfs /dev >/dev/null 2>&1 mount -nt proc proc /proc mount -o nosuid,nodev,noexec -t sysfs sysfs /sys [ ! -f /etc/notmpfs ] && { @@ -12,12 +12,14 @@ mount -o nosuid,nodev,noexec -t sysfs sysfs /sys mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev [ -d /dev/pts ] || mkdir /dev/pts [ -d /dev/shm ] || mkdir /dev/shm +mount -o nosuid,noexec -t tmpfs tmpfs /dev/shm mount -o nosuid,noexec -t devpts devpts /dev/pts exec 0<>/dev/console >&0 2>&0 echo >/dev/mdev.seq echo "/sbin/mdev" >/proc/sys/kernel/hotplug mdev -s cat /etc/.rnd >/dev/urandom 2>&1 +[ -x /kexecinit ] && { /kexecinit; } [ -x /cryptinit ] && { /cryptinit; exec switch_root /mnt "/init";} [ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;} || mount -o remount,rw / [ -f /etc/fstab ] && { fsck -p >/dev/null; mount -a;} diff --git a/package/base-files/src/sbin/adkupdate b/package/base-files/src/sbin/adkupdate index 619faf04f..b5477412f 100755 --- a/package/base-files/src/sbin/adkupdate +++ b/package/base-files/src/sbin/adkupdate @@ -89,6 +89,14 @@ case $1 in ;; esac +# fix permissions +if [ -f /usr/bin/sudo ];then + chmod 4755 /usr/bin/sudo +fi +if [ -f /usr/bin/Xorg ];then + chmod 4755 /usr/bin/Xorg +fi + sync if [ -x /sbin/cfgfs ];then umount /etc |