From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 20 Feb 2005 23:58:27 +0000 (+0000)
Subject: Switchbox fixes for OpenSlug - moved test for runboot before pivot
X-Git-Tag: Release-2010-05/1~14905
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2ebc5cf4c64f6e47c88a614f1af509d03c22eab;p=openembedded.git

Switchbox fixes for OpenSlug - moved test for runboot before pivot

BKrev: 42192423DOErl8MosPv9vLJNxtbH4g
---

diff --git a/packages/busybox/switchbox-1.00/linuxrc b/packages/busybox/switchbox-1.00/linuxrc
index 850d359000..90e365158d 100644
--- a/packages/busybox/switchbox-1.00/linuxrc
+++ b/packages/busybox/switchbox-1.00/linuxrc
@@ -152,16 +152,16 @@ if [ -n "$mounted" ] ; then
     fi
     umount /proc
     cd $mounted
-    /sbin/pivot_root . initrd
-    if [ -x /linuxrc ] ; then
+    if [ -x ./linuxrc -o -L ./linuxrc ] ; then
 	runboot=/linuxrc
-    elif [ -x /sbin/init ] ; then
+    elif [ -x ./sbin/init -o -L ./sbin/init ] ; then
 	runboot=/sbin/init
-    elif [ -x /bin/init ] ; then
+    elif [ -x ./bin/init -o -L ./bin/init ] ; then
 	runboot=/bin/init
     else
 	runboot=/bin/sh
     fi
+    /sbin/pivot_root . initrd
     exec chroot . $runboot  < dev/console > dev/console 2>&1
 fi