ambiser
/
btrbk
mirror of https://github.com/digint/btrbk
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrbk: action ls: change default output to format=short

pull/334/head
Axel Burri 2019-12-23 14:28:35 +01:00
parent c5b3ebb808
commit 0d19b0243e
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
btrbk
View File

@ -222,10 +222,10 @@ my %table_formats = (
raw => [ qw( tree uuid parent_uuid received_uuid recursion ) ], raw => [ qw( tree uuid parent_uuid received_uuid recursion ) ],
}, },
fs_list => { table => [ qw( mount_point id flags path ) ], fs_list => { table => [ qw( mount_source id flags mount_subvol mount_point subvolume_path subvolume_rel_path path ) ],
rel => [ qw( mount_source mount_point path subvolume_path subvolume_rel_path ) ], short => [ qw( mount_source id flags mount_point path ) ],
long => [ qw( mount_source mount_subvolume mount_point id top_level cgen gen uuid parent_uuid received_uuid flags path ) ], long => [ qw( mount_source id top cgen gen uuid parent_uuid received_uuid flags path ) ],
raw => [ qw( mount_source mount_subvolume mount_point mount_subvolid id top_level cgen gen uuid parent_uuid received_uuid readonly path subvolume_path subvolume_rel_path ) ], raw => [ qw( mount_source mount_subvol mount_point mount_subvolid id top_level cgen gen uuid parent_uuid received_uuid readonly path subvolume_path subvolume_rel_path ) ],
}, },
); );
@ -5345,10 +5345,11 @@ MAIN:
push @data, { push @data, {
%{$svol->{node}}, # copy node %{$svol->{node}}, # copy node
top => $svol->{node}{top_level}, # alias (narrow column)
mount_point => $svol->{VINFO_MOUNTPOINT}{PATH}, mount_point => $svol->{VINFO_MOUNTPOINT}{PATH},
mount_source => $svol->{node}{TREE_ROOT}{host_mount_source}, mount_source => $svol->{node}{TREE_ROOT}{host_mount_source},
mount_subvolid => $mnt->{MNTOPS}{subvolid}, mount_subvolid => $mnt->{MNTOPS}{subvolid},
mount_subvolume => $mnt->{MNTOPS}{subvol}, mount_subvol => $mnt->{MNTOPS}{subvol},
subvolume_path => $svol->{node}{path}, subvolume_path => $svol->{node}{path},
subvolume_rel_path => $svol->{node}{REL_PATH}, subvolume_rel_path => $svol->{node}{REL_PATH},
path => $svol->{PATH}, path => $svol->{PATH},
@ -5362,11 +5363,9 @@ MAIN:
} }
my @sorted = sort { $a->{path} cmp $b->{path} } @data; my @sorted = sort { $a->{path} cmp $b->{path} } @data;
if($output_format) { $output_format ||= "short";
print_formatted("fs_list", \@sorted); print_formatted("fs_list", \@sorted);
} else { #print join("\n", map { $_->{path} } @sorted) . "\n";
print join("\n", map { $_->{path} } @sorted) . "\n";
}
exit $exit_status; exit $exit_status;
} }