aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGerry Rozema <gerryr@rozeware.com>2006-08-18 22:37:40 +0000
committerGerry Rozema <gerryr@rozeware.com>2006-08-18 22:37:40 +0000
commitca3b37a4e888fee7ae3d43e609a27d787da60d58 (patch)
tree504c34449a9eeab631031e441570e79dc779f990 /target/linux
parentc38c5db597c53518b266548465b03da68d16b8ef (diff)
downloadupstream-ca3b37a4e888fee7ae3d43e609a27d787da60d58.tar.gz
upstream-ca3b37a4e888fee7ae3d43e609a27d787da60d58.tar.bz2
upstream-ca3b37a4e888fee7ae3d43e609a27d787da60d58.zip
Update init to use /etc/banner for presence test, remove postinit
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4604 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rwxr-xr-xtarget/linux/generic-2.6/files/init10
-rwxr-xr-xtarget/linux/generic-2.6/files/postinit4
2 files changed, 5 insertions, 9 deletions
diff --git a/target/linux/generic-2.6/files/init b/target/linux/generic-2.6/files/init
index eda776c87d..0c60acd639 100755
--- a/target/linux/generic-2.6/files/init
+++ b/target/linux/generic-2.6/files/init
@@ -62,11 +62,11 @@ done
COUNTER=0
while [ $COUNTER -lt 10 ]; do
sleep 1
- [ -e /mnt/postinit ] && let COUNTER=10;
+ [ -e /mnt/etc/banner ] && let COUNTER=10;
let COUNTER=COUNTER+1
done
-[ -e /mnt/postinit ] || {
- export FAILSAFE="No postinit"
+[ -e /mnt/etc/banner ] || {
+ export FAILSAFE="No Openwrt FS"
exec /bin/busybox init
}
@@ -76,5 +76,5 @@ mount -o move /proc /mnt/proc
mount -o move /dev /mnt/dev
mount -o move /tmp /mnt/tmp
mount -o move /sys /mnt/sys
-
-exec switch_root -c /dev/console /mnt /postinit
+mount none /tmp -t tmpfs
+exec switch_root -c /dev/console /mnt /sbin/init
diff --git a/target/linux/generic-2.6/files/postinit b/target/linux/generic-2.6/files/postinit
deleted file mode 100755
index 6ae1012bc5..0000000000
--- a/target/linux/generic-2.6/files/postinit
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/ash
-mount none /dev -t devfs
-exec /bin/busybox init
-