1 |
commit: d592d2d55fe04a8e8c1aadc3bbb2efb1ff565ae8 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 16 10:01:46 2017 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 27 21:41:22 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d592d2d5 |
7 |
|
8 |
cdrom.eclass: Remove ye olde Submount check |
9 |
|
10 |
Submount was last-rited in 2007 and was already dead long before that. |
11 |
|
12 |
eclass/cdrom.eclass | 4 +--- |
13 |
1 file changed, 1 insertion(+), 3 deletions(-) |
14 |
|
15 |
diff --git a/eclass/cdrom.eclass b/eclass/cdrom.eclass |
16 |
index 5e1fc23edfd..123be696637 100644 |
17 |
--- a/eclass/cdrom.eclass |
18 |
+++ b/eclass/cdrom.eclass |
19 |
@@ -181,9 +181,7 @@ _cdrom_locate_file_on_cd() { |
20 |
while [[ -n ${cdset[${i}]} ]] ; do |
21 |
local point= node= fs= foo= |
22 |
while read point node fs foo ; do |
23 |
- [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \ |
24 |
- ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \ |
25 |
- && continue |
26 |
+ [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && continue |
27 |
point=${point//\040/ } |
28 |
export CDROM_MATCH=$(_cdrom_glob_match "${point}" "${cdset[${i}]}") |
29 |
[[ -z ${CDROM_MATCH} ]] && continue |