summaryrefslogtreecommitdiffstats
path: root/perl-install/fs
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/fs')
-rw-r--r--perl-install/fs/format.pm5
-rw-r--r--perl-install/fs/type.pm5
2 files changed, 4 insertions, 6 deletions
diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm
index 157d24701..91b470964 100644
--- a/perl-install/fs/format.pm
+++ b/perl-install/fs/format.pm
@@ -128,9 +128,8 @@ sub part_raw {
disable_forced_fsck($dev);
}
- delete $part->{UUID_from_magic};
- fs::type::type_subpart_from_magic($part);
- $part->{device_UUID} = $part->{UUID_from_magic};
+ my $p = fs::type::type_subpart_from_magic($part);
+ $part->{device_UUID} = $p && $p->{device_UUID};
set_isFormatted($part, 1);
}
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index 71995af77..c0f89266d 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -279,9 +279,6 @@ sub type_subpart_from_magic {
my ($part) = @_;
my $ids = call_vol_id($part);
- $part->{LABEL_from_magic} = $ids->{ID_FS_LABEL} if $ids->{ID_FS_LABEL};
- $part->{UUID_from_magic} = $ids->{ID_FS_UUID} if $ids->{ID_FS_UUID};
-
my $p;
if ($ids->{ID_FS_USAGE} eq 'raid') {
my $name = {
@@ -297,6 +294,8 @@ sub type_subpart_from_magic {
if ($p) {
$part->{fs_type_from_magic} = $p->{fs_type};
+ $p->{device_LABEL} = $ids->{ID_FS_LABEL} if $ids->{ID_FS_LABEL};
+ $p->{device_UUID} = $ids->{ID_FS_UUID} if $ids->{ID_FS_UUID};
}
$p;
}