From 299738fd1af3a9d854e00a2c3a4e743cf6ec15f4 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sat, 4 Mar 2017 12:34:09 +0000
Subject: Remove redundant code when initialising a partition table.

Now we force the kernel to reread the partition table when we initialise
it, there's no need to also inform it that we've deleted all the existing
partitions.
---
 perl-install/fsedit.pm              | 19 +++----------------
 perl-install/partition_table/raw.pm |  6 ------
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index cfde46dd6..2fcd1f1ee 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -209,7 +209,7 @@ sub get_hds {
 
 	if ($flags->{clearall} || member($hd->{device}, @{$flags->{clear} || []})) {
 	    my $lvms = []; #- temporary one, will be re-created later in get_hds()
-	    partition_table_initialize($lvms, $hd, $o_in);
+	    partition_table_clear_and_initialize($lvms, $hd, $o_in);
 	} else {
 	    my $handle_die_and_cdie = sub {
 		if (my $type = fs::type::type_subpart_from_magic($hd)) {
@@ -628,25 +628,12 @@ sub change_type {
 
 =item partition_table_clear_and_initialize($lvms, $hd, $o_in, $o_type, $b_warn) = @_;
 
-wrapper around partition_table::initialize().
-
-=cut
-
-sub partition_table_clear_and_initialize {
-    my ($lvms, $hd, $o_in, $o_type, $b_warn) = @_;
-    $hd->clear_existing;
-    partition_table_initialize($lvms, $hd, $o_in, $o_type, $b_warn);
-}
-
-=item partition_table_initialize($lvms, $hd, $o_in, $o_type, $b_warn) = @_;
-
-wrapper around partition_table::initialize() like
-partition_table_clear_and_initialize() but which also create a singleton VG
+wrapper around partition_table::initialize() but which also create a singleton VG
 automatically (so that it's easier for the user)
 
 =cut
 
-sub partition_table_initialize {
+sub partition_table_clear_and_initialize {
     my ($lvms, $hd, $o_in, $o_type, $b_warn) = @_;
     partition_table::initialize($hd, $o_type);
     if ($hd->isa('partition_table::lvm')) {
diff --git a/perl-install/partition_table/raw.pm b/perl-install/partition_table/raw.pm
index ebb20b179..8ea1ddb1d 100644
--- a/perl-install/partition_table/raw.pm
+++ b/perl-install/partition_table/raw.pm
@@ -226,12 +226,6 @@ sub raw_add {
 
 sub zero_MBR { &partition_table::initialize } #- deprecated
 
-sub clear_existing {
-    my ($hd) = @_;
-    my @parts = (partition_table::get_normal_parts($hd), if_($hd->{primary}{extended}, $hd->{primary}{extended}));
-    partition_table::will_tell_kernel($hd, del => $_) foreach @parts;
-}
-
 #- deprecated
 sub zero_MBR_and_dirty { 
     my ($hd) = @_;
-- 
cgit v1.2.1