From 99894b862e6979bf76889db43f449fd7b819561c Mon Sep 17 00:00:00 2001
From: Roy Marples <uberlord@gentoo.org>
Date: Tue, 14 Nov 2006 12:04:48 +0000
Subject: [PATCH] Support submount again and do globbing on the RHS

---
 eclass/eutils.eclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 1df43022b866..0e54a782a510 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.263 2006/11/13 20:58:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.264 2006/11/14 12:04:48 uberlord Exp $
 #
 # This eclass is for general purpose functions that most ebuilds
 # have to implement themselves.
@@ -1402,7 +1402,9 @@ _cdrom_locate_file_on_cd() {
 
 			local point= node= fs= foo=
 			while read point node fs foo ; do
-				[[ *" ${fs} "* != " cd9660 iso9660 " ]] && continue
+				[[ " cd9660 iso9660 " != *" ${fs} "* ]] && \
+					! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
+					&& continue
 				point=${point//\040/ }
 				[[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
 				export CDROM_ROOT=${point}
-- 
2.26.2