aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaarten Vanraes <alien@mageia.org>2016-02-07 16:46:29 +0100
committerMaarten Vanraes <alien@mageia.org>2016-05-14 09:25:24 +0200
commit6a118f726fec17bd13c6f4e797fd9b7686a5ae36 (patch)
treec41cdfd36f074ac28d31cdf0fe8ee89df033bf53
parent444376d97e5311abfbc47ee9dc297b8f44e2240f (diff)
downloadmanatools-6a118f726fec17bd13c6f4e797fd9b7686a5ae36.tar
manatools-6a118f726fec17bd13c6f4e797fd9b7686a5ae36.tar.gz
manatools-6a118f726fec17bd13c6f4e797fd9b7686a5ae36.tar.bz2
manatools-6a118f726fec17bd13c6f4e797fd9b7686a5ae36.tar.xz
manatools-6a118f726fec17bd13c6f4e797fd9b7686a5ae36.zip
Swap: use swaplabel tool to get uuid and label
-rw-r--r--lib/ManaTools/Shared/disk_backend/Plugin/Swap.pm12
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/ManaTools/Shared/disk_backend/Plugin/Swap.pm b/lib/ManaTools/Shared/disk_backend/Plugin/Swap.pm
index 175706b9..8765b041 100644
--- a/lib/ManaTools/Shared/disk_backend/Plugin/Swap.pm
+++ b/lib/ManaTools/Shared/disk_backend/Plugin/Swap.pm
@@ -64,6 +64,12 @@ has '+dependencies' => (
}
);
+has '+tools' => (
+ default => sub {
+ return {'swaplabel' => '/usr/sbin/swaplabel'};
+ }
+);
+
#=============================================================
=head2 probe
@@ -94,6 +100,12 @@ override ('probe', sub {
$part->prop('size', $fields[2]);
$part->prop('used', $fields[3]);
$part->prop('priority', $fields[4]);
+
+ # use swaplabel to get label and uuid
+ my %labelfields = $self->tool_fields('swaplabel', ':', $fields[0]);
+ $part->prop('uuid', defined($labelfields{'UUID'}) ? $labelfields{'UUID'} : '');
+ $part->prop('label', defined($labelfields{'LABEL'}) ? $labelfields{'LABEL'} : '');
+
# check first if it's a device, then find the define
my @stat = stat($fields[0]);
# if device: then...