Skip good_root check for /dev/nfs for gentoo bug #246759

diff --git a/ChangeLog b/ChangeLog
index e011419590638de7a0f6551433985165321a0e92..0c0fbd320443e0becaa1277f50cc3f9220b0bcf5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney
 # Distributed under the GPL v2
 
+  14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/linuxrc:
+  Skip good_root check for /dev/nfs for gentoo bug #246759
+
   14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts:
   Simplify implementation of parse_opt in linuxrc
 

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 49a476de9f012e94b7717287f7c6223673ca65dc..2d363329615c809b4f0aeeee08abefb27ac8ae22 100644 (file)
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -431,7 +431,7 @@ do
                # else not a good root and start over.
                if [ "$?" = '0' ]
                then
-                       if [ -d ${NEW_ROOT}/dev -a -x ${NEW_ROOT}/sbin/init ]
+                       if [ -d ${NEW_ROOT}/dev -a -x ${NEW_ROOT}/sbin/init ] || [ "${REAL_ROOT}" = "/dev/nfs" ]
                        then
                                break
                        else