summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2017-04-16 11:01:46 +0100
committerJames Le Cuirot <chewi@gentoo.org>2017-04-27 22:41:22 +0100
commitd592d2d55fe04a8e8c1aadc3bbb2efb1ff565ae8 (patch)
tree9be8b5088169a6b5f11cf21b605ada19b032b085
parentcdrom.eclass: Allow CDROM_NAMES changes before each cdrom_load_next_cd (diff)
downloadgentoo-d592d2d5.tar.gz
gentoo-d592d2d5.tar.bz2
gentoo-d592d2d5.zip
cdrom.eclass: Remove ye olde Submount check
Submount was last-rited in 2007 and was already dead long before that.
-rw-r--r--eclass/cdrom.eclass4
1 files changed, 1 insertions, 3 deletions
diff --git a/eclass/cdrom.eclass b/eclass/cdrom.eclass
index 5e1fc23edfd9..123be696637c 100644
--- a/eclass/cdrom.eclass
+++ b/eclass/cdrom.eclass
@@ -181,9 +181,7 @@ _cdrom_locate_file_on_cd() {
while [[ -n ${cdset[${i}]} ]] ; do
local point= node= fs= foo=
while read point node fs foo ; do
- [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
- ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
- && continue
+ [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && continue
point=${point//\040/ }
export CDROM_MATCH=$(_cdrom_glob_match "${point}" "${cdset[${i}]}")
[[ -z ${CDROM_MATCH} ]] && continue