yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scan storage: order scanned shares alphabetically

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2020-07-01 10:25:32 +02:00
parent c42d86559c
commit 0b49e5cc6a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/CLI/pvesm.pm
View File

@ -434,7 +434,7 @@ __PACKAGE__->register_method ({
my $res = PVE::Storage::scan_nfs($server); my $res = PVE::Storage::scan_nfs($server);
my $data = []; my $data = [];
foreach my $k (keys %$res) { foreach my $k (sort keys %$res) {
push @$data, { path => $k, options => $res->{$k} }; push @$data, { path => $k, options => $res->{$k} };
} }
return $data; return $data;
@ -503,7 +503,7 @@ __PACKAGE__->register_method ({
my $res = PVE::Storage::scan_cifs($server, $username, $password, $domain); my $res = PVE::Storage::scan_cifs($server, $username, $password, $domain);
my $data = []; my $data = [];
foreach my $k (keys %$res) { foreach my $k (sort keys %$res) {
push @$data, { share => $k, description => $res->{$k} }; push @$data, { share => $k, description => $res->{$k} };
} }
@ -553,7 +553,7 @@ __PACKAGE__->register_method ({
my $res = PVE::Storage::scan_nfs($server); my $res = PVE::Storage::scan_nfs($server);
my $data = []; my $data = [];
foreach my $path (keys %$res) { foreach my $path (sort keys %$res) {
if ($path =~ m!^/([^\s/]+)$!) { if ($path =~ m!^/([^\s/]+)$!) {
push @$data, { volname => $1 }; push @$data, { volname => $1 };
} }
@ -603,7 +603,7 @@ __PACKAGE__->register_method ({
my $res = PVE::Storage::scan_iscsi($param->{portal}); my $res = PVE::Storage::scan_iscsi($param->{portal});
my $data = []; my $data = [];
foreach my $k (keys %$res) { foreach my $k (sort keys %$res) {
push @$data, { target => $k, portal => join(',', @{$res->{$k}}) }; push @$data, { target => $k, portal => join(',', @{$res->{$k}}) };
} }