mirror of
https://github.com/libguestfs/libguestfs.git
synced 2026-03-22 07:03:38 +00:00
virt-list-filesystems: Fix to use $g->canonical_device_name instead of homebrew function.
The homebrew function didn't recognize /dev/ubd* device names, and in any case using the API function is shorter and clearer. (cherry picked from commit4275404626) (cherry picked from commitb312c245d3)
This commit is contained in:
@@ -167,7 +167,7 @@ foreach $dev (sort keys %fses) {
|
||||
$fstype = $fses{$dev};
|
||||
|
||||
if ($all || ($fstype ne "swap" && $fstype ne "unknown")) {
|
||||
print canonicalize($dev);
|
||||
print $g->canonical_device_name ($dev);
|
||||
if ($long) {
|
||||
print " $fstype";
|
||||
}
|
||||
@@ -175,18 +175,6 @@ foreach $dev (sort keys %fses) {
|
||||
}
|
||||
}
|
||||
|
||||
# The reverse of device name translation, see
|
||||
# BLOCK DEVICE NAMING in guestfs(3).
|
||||
sub canonicalize
|
||||
{
|
||||
local $_ = shift;
|
||||
|
||||
if (m{^/dev/[hv]d([a-z]\d)$}) {
|
||||
return "/dev/sd$1";
|
||||
}
|
||||
$_;
|
||||
}
|
||||
|
||||
=head1 SHELL QUOTING
|
||||
|
||||
Libvirt guest names can contain arbitrary characters, some of which
|
||||
|
||||
Reference in New Issue
Block a user