summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-03-25 06:15:28 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-03-25 19:55:51 +0100
commit8d8e7bd48c35338cbdd84f957d51f7f02ad920fa (patch)
tree5be1fda2a8e48fc4b99d1f17cad4cc532a3ec4a6
parent14f3a580a02af53896d98ac559ec0788642996a6 (diff)
downloaddrakx-8d8e7bd48c35338cbdd84f957d51f7f02ad920fa.tar
drakx-8d8e7bd48c35338cbdd84f957d51f7f02ad920fa.tar.gz
drakx-8d8e7bd48c35338cbdd84f957d51f7f02ad920fa.tar.bz2
drakx-8d8e7bd48c35338cbdd84f957d51f7f02ad920fa.tar.xz
drakx-8d8e7bd48c35338cbdd84f957d51f7f02ad920fa.zip
log which partition we fail to add
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/partition_table/gpt.pm4
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();