summaryrefslogtreecommitdiffstats
path: root/perl-install/partition_table
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2019-08-10 20:40:46 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2020-02-29 15:01:28 +0000
commite8f3026f210a8de175242658304c8fe83729cf5a (patch)
treeb312fb605dc23288d19f0da0234a38bd656286e8 /perl-install/partition_table
parentf9a43be6ee23983c7be107a5d6a0abf5fe239aba (diff)
downloaddrakx-e8f3026f210a8de175242658304c8fe83729cf5a.tar
drakx-e8f3026f210a8de175242658304c8fe83729cf5a.tar.gz
drakx-e8f3026f210a8de175242658304c8fe83729cf5a.tar.bz2
drakx-e8f3026f210a8de175242658304c8fe83729cf5a.tar.xz
drakx-e8f3026f210a8de175242658304c8fe83729cf5a.zip
diskdrake: support adding partitions to Live ISOs on USB sticks (mga#25224)
Diffstat (limited to 'perl-install/partition_table')
-rw-r--r--perl-install/partition_table/raw.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/partition_table/raw.pm b/perl-install/partition_table/raw.pm
index 8ea1ddb1d..4fca26de4 100644
--- a/perl-install/partition_table/raw.pm
+++ b/perl-install/partition_table/raw.pm
@@ -246,7 +246,8 @@ sub read_primary {
my $primary = partition_table::raw::pt_info_to_primary($hd, $pt, $info);
$hd->{primary} = $primary;
undef $hd->{extended};
- partition_table::verifyPrimary($primary);
+ my $is_hybrid_iso = $hd->{current_pt_table_type} eq 'dos' && $hd->{fs_type_from_magic} eq 'iso9660';
+ partition_table::verifyPrimary($primary, $is_hybrid_iso);
1;
}