From c0bfc7b12323e09e0ac1c03a0981f9428794b11c Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Tue, 6 Aug 2013 13:20:08 +0200
Subject: [PATCH] Revert "linuxrc: do not look for ${REAL_INIT} inside the
 mounted partition"

This reverts commit 3bb6c62bd9bb7f9a4c88b8f030ec5723432cb141.
---
 defaults/linuxrc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 1e717dc..8311669 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -443,7 +443,14 @@ do
 		# else not a good root and start over.
 		if [ "$?" = '0' ]
 		then
-			break
+			if [ -d ${NEW_ROOT}/dev -a -x "${NEW_ROOT}${REAL_INIT:-/sbin/init}" ] || [ "${REAL_ROOT}" = "/dev/nfs" ]
+			then
+				break
+			else
+				bad_msg "The filesystem mounted at ${REAL_ROOT} does not appear to be a valid /, try again"
+				got_good_root=0
+				REAL_ROOT=''
+			fi
 		else
 			bad_msg "Could not mount specified ROOT, try again"
 			got_good_root=0