From 429fded33a34ff63e37af5c32aa5f7f9b38e052c Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Tue, 23 Jun 2020 20:46:55 +0000 Subject: diskdrake: fix a crash on whole disk filesystems (mga#26849) When a disk has a filesystem directly without a partition table, libparted tells us the partition table is of type loop and we don't have code to handle that, causing a crash: Can't locate partition_table/loop.pm in @INC (you may need to install the partition_table::loop module) (@INC contains: /usr/lib/libDrakX /usr/local/lib64/perl5 /usr/local/share/perl5/5.32 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at /usr/lib/libDrakX/partition_table.pm line 287. Perl's trace: drakbug::bug_handler() called from /usr/lib/libDrakX/partition_table.pm:287 partition_table::initialize() called from /usr/lib/libDrakX/partition_table/raw.pm:227 partition_table::raw::zero_MBR() called from /usr/lib/libDrakX/fsedit.pm:265 fsedit::get_hds() called from /usr/libexec/diskdrake:74 We should probably be more generic and treat the same way any partition table type name we don't know rather than crashing. --- perl-install/partition_table.pm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'perl-install/partition_table.pm') diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm index 6ab40174b..4d77c3cd4 100644 --- a/perl-install/partition_table.pm +++ b/perl-install/partition_table.pm @@ -264,6 +264,8 @@ sub _get_disk_type { my ($hd) = @_; my $current = c::get_disk_type($hd->{file}); $current = 'dos' if $current eq 'msdos'; + # When a disk contains a FS directly (no partition table) parted calls it loop + $current = '' if $current eq 'loop'; $hd->{current_pt_table_type} = $current; } -- cgit v1.2.1