From 8d8e7bd48c35338cbdd84f957d51f7f02ad920fa Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 25 Mar 2015 06:15:28 -0400
Subject: log which partition we fail to add

---
 perl-install/NEWS                   | 1 +
 perl-install/install/NEWS           | 1 +
 perl-install/partition_table/gpt.pm | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 9ad114fb1..a7dc87ecc 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
 - diskdrake:
   o fix retrieving ESP partition type on GPT
+  o log which GPT partition we fail to add/del
   o set proper GUID to ESP partitions with GPT layout
 - bump max_nb() to 131 to cover mdadm managed imsm and ddf1 bios
   fakeraids (containers defaults to >= 127 and partitions <=126)
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 3d1b848df..425fa3903 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -2,6 +2,7 @@
   fakeraids (containers defaults to >= 127 and partitions <=126)
 - partitionning:
   o fix retrieving ESP partition type on GPT
+  o log which GPT partition we fail to add/del
   o set proper GUID to ESP partitions with GPT layout
 
 Version 16.69 - 20 March 2015
diff --git a/perl-install/partition_table/gpt.pm b/perl-install/partition_table/gpt.pm
index c6dd20f8f..9f3093395 100644
--- a/perl-install/partition_table/gpt.pm
+++ b/perl-install/partition_table/gpt.pm
@@ -141,13 +141,13 @@ sub write {
         my ($part) = grep { $_->{start} == $o_start && $_->{size} == $o_size } @$pt;
         print "($action, $part_number, $o_start, $o_size)\n";
         if ($action eq 'add') {
-            c::disk_add_partition($hd->{file}, $o_start, $o_size, $part->{fs_type}) or die "failed to add partition";
+            c::disk_add_partition($hd->{file}, $o_start, $o_size, $part->{fs_type}) or die "failed to add partition #$part_number on $hd->{file}";
 	    if (isESP($part)) {
                 c::set_partition_flag($hd->{file}, $part_number, 'ESP')
                   or die "failed to set type for $part->{file} on $part->{mntpoint}";
 	    }
         } elsif ($action eq 'del' and !$partitions_killed) {
-            c::disk_del_partition($hd->{file}, $part_number) or die "failed to del partition";
+            c::disk_del_partition($hd->{file}, $part_number) or die "failed to del partition #$part_number on $hd->{file}";
         }
     }
     common::sync();
-- 
cgit v1.2.1