michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't resolve labels unless their are any

Browse Source
This commit is contained in:
Jamie Cameron
2021-06-26 18:07:13 -07:00
parent 2b8b5df10b
commit 2d454cfc22
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mount/linux-lib.pl
View File

@@ -448,7 +448,19 @@ sub list_mounted
return @list_mounted_cache
if (@list_mounted_cache && $list_mounted_cache_mode == $_[0]);
local(@rv, @p, @o, $mo, $_, %smbopts);
# Do any filesystems use labels that we need to resolve?
local @mounts = &list_mounts();
local $anylabel = 0;
local $anyuuid = 0;
foreach my $m (@mounts) {
if ($m->[1] =~ /^LABEL=/) {
$anylabel++;
}
if ($m->[1] =~ /^UUID=/) {
$anyuuid++;
}
}
&read_smbopts();
open(MTAB, "</etc/mtab");
@@ -484,13 +496,13 @@ while(<MTAB>) {
# The source for proc mounts is always proc
$p[0] = "proc";
}
if (!$_[0]) {
if (!$_[0] && $anylabel) {
# Check for a label on this partition, and there is one
# and this filesystem is in fstab with the label, change
# the device.
local $label = &get_filesystem_label(@p);
if (defined($label)) {
foreach $m (@mounts) {
foreach my $m (@mounts) {
if ($m->[0] eq $p[1] &&
$m->[1] eq "LABEL=$label") {
$p[0] = "LABEL=$label";
@@ -503,7 +515,7 @@ while(<MTAB>) {
# Check for a UUID on this partition, and if there is one
# and the filesystem is in fstab with the label, change
# the device.
if (!$_[0]) {
if (!$_[0] && $anyuuid) {
local $uuid = &device_to_uuid($p[0], \@mounts);
if ($uuid) {
$p[0] = "UUID=$uuid";