summaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch')
-rw-r--r--meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch7
1 files changed, 3 insertions, 4 deletions
diff --git a/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch b/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch
index 787bd8c69..7d6a2275f 100644
--- a/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch
+++ b/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch
@@ -8,9 +8,9 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
8 8
9Upstream-Status: Pending 9Upstream-Status: Pending
10 10
11--- webmin-1.570.orig/mount/index.cgi 11--- a/mount/index.cgi
12+++ webmin-1.570/mount/index.cgi 12+++ b/mount/index.cgi
13@@ -33,10 +33,12 @@ elsif ($config{'sort_mode'} == 1) { 13@@ -34,9 +34,11 @@ elsif ($config{'sort_mode'} == 1) {
14 } 14 }
15 15
16 # Build visible filesystems list 16 # Build visible filesystems list
@@ -18,7 +18,6 @@ Upstream-Status: Pending
18 foreach $m (@all) { 18 foreach $m (@all) {
19 @minfo = @$m; 19 @minfo = @$m;
20 $p = &simplify_mount_path($minfo[0], $minfo[2]); 20 $p = &simplify_mount_path($minfo[0], $minfo[2]);
21 next if ($ignore{$minfo[2]});
22+ next if (grep {$_ eq $minfo[2]} @excludefs); 21+ next if (grep {$_ eq $minfo[2]} @excludefs);
23 @mmodes = &mount_modes($minfo[2], $minfo[0], $minfo[1]); 22 @mmodes = &mount_modes($minfo[2], $minfo[0], $minfo[1]);
24 $canedit = $can_edit{$minfo[2]} && !$mmodes[4] && 23 $canedit = $can_edit{$minfo[2]} && !$mmodes[4] &&