diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-16 11:07:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-16 11:07:13 +0200 |
| commit | 5861b2783c0615345b80a93470312b36d1cb9907 (patch) | |
| tree | 42ded4821e0834063449a5620a1b46bc6f1e509b /package/base-files/src | |
| parent | e3d296fa18ef060fad7e654cd9308e57ffd0934b (diff) | |
| parent | d8a75c17f7cb861b42f327afc9a9ec3901133d2c (diff) | |
fix conflict
Diffstat (limited to 'package/base-files/src')
| -rwxr-xr-x | package/base-files/src/init | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/package/base-files/src/init b/package/base-files/src/init index a3232cb9c..a9564011d 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 ] && { @@ -18,6 +18,7 @@ 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;} |