1 files changed, 89 insertions, 34 deletions

diff --git a/perl-install/partition_table/gpt.pm b/perl-install/partition_table/gpt.pm
index 10eab253b..3ac6673d6 100644
--- a/perl-install/partition_table/gpt.pm
+++ b/perl-install/partition_table/gpt.pm
@@ -1,4 +1,4 @@
-package partition_table::gpt; # $Id$
+package partition_table::gpt;
 
 use diagnostics;
 use strict;
@@ -6,72 +6,127 @@ use vars qw(@ISA);
 
 @ISA = qw(partition_table::raw);
 
+use fs::type;
 use partition_table::raw;
 use c;
 
-#sub use_pt_type { 1 }
+my $nb_primary = 128;
+
+# See https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs for a list of exitings GUIDs
+
+sub first_usable_sector { 34 }
+
+sub last_usable_sector {
+    my ($hd) = @_;
+    #- do not use totalsectors because backup GPT is at end
+    $hd->{totalsectors} - 33;
+}
+
+my %parted_mapping = (
+   'linux-swap(v1)' => 'swap',
+   'ntfs' => 'ntfs-3g',
+   'fat16' => 'vfat',
+   'fat32' => 'vfat',
+   );
+my %rev_parted_mapping = reverse %parted_mapping;
+# prefer 'fat32' over 'fat16':
+$rev_parted_mapping{vfat} = 'fat32';
 
 sub read_one {
-    my ($hd, $sector) = @_;
-    my $info;
-
-    c::get_disk_type($hd->{file}) eq "gpt" or die "not a GPT disk";
-    my @pt = map {
-        my %p;
-        print $_;
-        if (/^([^ ]*) ([^ ]*) ([^ ]*) (.*) \((\d*),(\d*),(\d*)\)$/) {
-            $p{part_number} = $1;
-            $p{real_device} = $2;
-            $p{fs_type} = $3;
-            $p{pt_type} = 0xba;
-            $p{start} = $5;
-            $p{size} = $7;
+    my ($hd, $_sector) = @_;
+
+    c::get_disk_type($hd->{file}) eq "gpt" or die "$hd->{device} not a GPT disk ($hd->{file})";
+
+    my @pt;
+    foreach (c::get_disk_partitions($hd->{file})) {
+        # compatibility with MBR partitions tables:
+        $_->{pt_type} = 0x82 if $_->{fs_type} eq 'swap';
+        $_->{pt_type} = 0x0b if $_->{fs_type} eq 'vfat';
+        $_->{pt_type} = 0x83 if $_->{fs_type} =~ /^ext/;
+
+        # fix detecting ESP (special case are they're detected through pt_type):
+        if ($_->{flag} eq 'ESP') {
+	    $_->{pt_type} = 0xef;
+        } elsif ($_->{flag} eq 'BIOS_GRUB') {
+	    $_->{fs_type} = $_->{flag}; # hack to prevent it to land in hd->{raw}
+	    $_->{pt_type} = $_->{flag}; # hack...
+        } elsif ($_->{flag} eq 'LVM') {
+	    $_->{pt_type} = 0x8e;
+        } elsif ($_->{flag} eq 'RAID') {
+	    $_->{pt_type} = 0xfd;
+        } elsif ($_->{flag} eq 'RECOVERY') {
+	    $_->{pt_type} = 0x12;
         }
-        \%p;
-    } c::get_disk_partitions($hd->{file});
+        $_->{fs_type} = $parted_mapping{$_->{fs_type}} if $parted_mapping{$_->{fs_type}};
 
-    use Data::Dumper;
-    print Dumper(@pt);
+        @pt[$_->{part_number}-1] = $_;
+    }
+
+    for (my $part_number = 1; $part_number < $nb_primary; $part_number++) {
+	next if exists($pt[$part_number-1]);
+	$pt[$part_number-1] = { part_number => $part_number };
+    }
 
-    [ @pt ], $info;
+    \@pt;
 }
 
 sub write {
-    my ($hd, $sector, $pt, $info) = @_;
+    my ($hd, $_sector, $pt, $_info) = @_;
+
+    my $partitions_killed;
 
     # Initialize the disk if current partition table is not gpt
     if (c::get_disk_type($hd->{file}) ne "gpt") {
         c::set_disk_type($hd->{file}, "gpt");
+        $partitions_killed = 1;
     }
 
+    # sync libparted view with diskdrake one in order to prevent overlapping errors when adding partitions:
+    c::disk_delete_all($hd->{file}) if delete $hd->{sync_with_libparted};
+
     foreach (@{$hd->{will_tell_kernel}}) {
         my ($action, $part_number, $o_start, $o_size) = @$_;
-        my $part;
+        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";
-        } elsif ($action eq 'del') {
-            c::disk_del_partition($hd->{file}, $part_number) or die "failed to del partition";
+            local $part->{fs_type} = $rev_parted_mapping{$part->{fs_type}} if $rev_parted_mapping{$part->{fs_type}};
+            c::disk_add_partition($hd->{file}, $o_start, $o_size, $part->{fs_type}) or die "failed to add partition #$part_number on $hd->{file}";
+	    my $flag;
+	    if (isESP($part)) {
+                $flag = 'ESP';
+	    } elsif (isBIOS_GRUB($part)) {
+                $flag = 'BIOS_GRUB';
+	    } elsif (isRawLVM($part)) {
+                $flag = 'LVM';
+	    } elsif (isRawRAID($part)) {
+                $flag = 'RAID';
+	    }
+	    if ($flag) {
+	        c::set_partition_flag($hd->{file}, $part_number, $flag)
+	          or die "failed to set type '$flag' for $part->{file} on $part->{mntpoint}";
+	    }
+        } elsif ($action eq 'del' && !$partitions_killed) {
+            c::disk_del_partition($hd->{file}, $part_number) or die "failed to del partition #$part_number on $hd->{file}";
         }
     }
+    # prevent errors when telling kernel to reread partition table:
+    # (above add/del_partition result in udev events)
+    system(qw(udevadm settle));
     common::sync();
     1;
 }
 
 sub initialize {
     my ($class, $hd) = @_;
-    $hd->{primary} = { raw => [] };
+    # sync libparted view with diskdrake one in order to prevent overlapping errors when adding partitions:
+    $hd->{sync_with_libparted} = 1;
+    # part_number starts at 1
+    my @raw = map { +{ part_number => $_ + 1 } } 0..$nb_primary-2;
+    $hd->{primary} = { raw => \@raw };
     bless $hd, $class;
 }
 
 sub can_add { &can_raw_add }
-sub can_raw_add { 1 }
-sub raw_add {
-    my ($hd, $raw, $part) = @_;
-    $hd->can_raw_add or die "raw_add: partition table already full";
-    push @$raw, $part;
-}
-
 sub adjustStart {}
 sub adjustEnd {}