1 files changed, 104 insertions, 7 deletions

diff --git a/perl-install/partition_table/dos.pm b/perl-install/partition_table/dos.pm
index 2376fce11..aa020131a 100644
--- a/perl-install/partition_table/dos.pm
+++ b/perl-install/partition_table/dos.pm
@@ -1,4 +1,4 @@
-package partition_table::dos; # $Id$
+package partition_table::dos;
 
 use diagnostics;
 use strict;
@@ -6,12 +6,24 @@ use vars qw(@ISA);
 
 @ISA = qw(partition_table::raw);
 
+use Time::HiRes qw(usleep);
 use common;
 use partition_table::raw;
 use partition_table;
+use fs::proc_partitions;
 use fs::type;
 use c;
 
+=head1 SYNOPSYS
+
+Read/write MBR partition tables
+
+=head1 Functions
+
+=over
+
+=cut
+
 my @fields = qw(active start_head start_sec start_cyl pt_type end_head end_sec end_cyl start size);
 my $format = "C8 V2";
 my $magic = "\x55\xAA";
@@ -29,7 +41,7 @@ sub geometry_to_string {
 
 sub last_usable_sector { 
     my ($hd) = @_;
-    #- do not use totalsectors, see gi/docs/Partition-ends-after-end-of-disk.txt for more
+    #- do not use totalsectors, see docs/Partition-ends-after-end-of-disk.txt for more
     $hd->{geom}{sectors} * $hd->{geom}{heads} * $hd->{geom}{cylinders};
 }
 
@@ -93,7 +105,12 @@ sub CHS2rawCHS {
     [ $c & 0xff, $h, ($s + 1) | (($c >> 2) & 0xc0) ];
 }
 
-# returns (cylinder, head, sector)
+=item sector2CHS($geom, $start)
+
+returns (cylinder, head, sector)
+
+=cut
+
 sub sector2CHS {
     my ($geom, $start) = @_;
     my ($s, $h);
@@ -212,6 +229,7 @@ sub read_one {
 	sysread $F, $tmp, psizeof($format) or die "error while reading partition table in sector $sector";
 	my %h; 
 	@h{@fields} = unpack $format, $tmp;
+	$h{pt_type} = 'BIOS_GRUB' if $h{pt_type} == 0 && $h{size} > 0;
 	fs::type::set_pt_type(\%h, $h{pt_type});
 	\%h;
     } (1..$nb_primary);
@@ -220,13 +238,30 @@ sub read_one {
     sysread $F, $tmp, length $magic or die "error reading magic number on disk $hd->{device}";
     $tmp eq $magic or die "bad magic number on disk $hd->{device}";
 
+    if ($hd->{current_pt_table_type} ne "dos") {
+	# libparted may have ignored it because of overlapping partitions or other error
+	# while it is actually a partition table.
+	$hd->{fs_type_from_magic} and die "unpartitionned disk";
+	my $primary = partition_table::raw::pt_info_to_primary($hd, [ @pt ]);
+       foreach my $i (@{$primary->{normal}}) {
+          if ($i->{active} && $i->{active} != 0x80 || 
+             $hd->{totalsectors} && $i->{start} > $hd->{totalsectors}) {
+                die "Invalid DOS partition table";
+          }
+       }
+    }
+
     [ @pt ];
 }
 
-# write the partition table (and extended ones)
-# for each entry, it uses fields: start, size, pt_type, active
-sub write {
-    my ($hd, $sector, $pt) = @_;
+=item start_write($hd)
+
+Prepare to write the partition table (and extended ones)
+
+=cut
+
+sub start_write {
+    my ($hd) = @_;
 
     log::l("partition::dos::write $hd->{device}");
 
@@ -237,6 +272,27 @@ sub write {
 	open $F, ">$file" or die "error opening test file $file";
     } else {
 	$F = partition_table::raw::openit($hd, 2) or die "error opening device $hd->{device} for writing";
+	if ($hd->{was_hybrid_iso}) {
+	    log::l("partition::dos::start_write erasing hybrid iso9660 signature");
+	    c::lseek_sector(fileno($F), 0, 0x8001) or return 0;
+	    syswrite $F, "\0\0\0\0\0", 5 or return 0;
+	    $hd->{was_hybrid_iso} = 0;
+	}
+    }
+    $F;
+}
+
+=item start_write($hd, $F, $sector, $pt)
+
+Write the partition table (and extended ones).
+For each entry, it uses fields: start, size, pt_type, active
+
+=cut
+
+sub write {
+    my ($hd, $F, $sector, $pt) = @_;
+
+    if (!$::testing) {
         c::lseek_sector(fileno($F), $sector, $offset) or return 0;
     }
 
@@ -251,10 +307,51 @@ sub write {
     1;
 }
 
+sub end_write {
+    my ($hd, $F) = @_;
+    close $F;
+}
+
+sub need_to_tell_kernel {
+    my ($hd) = @_;
+    # Whenever udevd receives a change event for a raw disk device it is watching, it asks the kernel to
+    # rescan the partition table on that device by calling the BLKRRPART ioctl. This is only successful
+    # if none of the partitions on that device are currently mounted. So if any partitions are mounted,
+    # we need to tell the kernel what has changed ourselves.
+    # The udev/rules.d/60-block.rules file causes the raw disk devices to be watched by udev. This file is
+    # not present in the cut-down system used to run the classic installer, so we always need to tell the
+    # kernel in that case.
+    # diskdrake will not let the user delete an individual partition that is mounted, but will let the
+    # user clear all partitions. So initialize() records if any partitions were mounted and we take note
+    # of that here.
+    return 1 if ! -e '/usr/lib/udev/rules.d/60-block.rules' || delete $hd->{hadMountedPartitions} || any { $_->{isMounted} } partition_table::get_normal_parts($hd);
+
+    # No further actions must be performed until the kernel has been informed of the changes. There is
+    # no easy way to check that udevd has received the uevent and called the BLKRRPART ioctl, so do it
+    # the hard way.
+    my $tries = 0;
+    do {
+	usleep(100000);
+	log::l("checking that udevd has informed the kernel of partition table changes");
+	eval { fs::proc_partitions::compare($hd) };
+	return 0 if !$@;
+	$tries++;
+    } while $tries < 5;
+
+    # We don't expect to get here, but fail safe if so.
+    log::l("udevd failed to inform kernel of partition table changes");
+    $hd->{rebootNeeded} = 1;
+    1;
+}
+
 sub empty_raw { { raw => [ ({}) x $nb_primary ] } }
 
 sub initialize { 
     my ($class, $hd) = @_;
+    # Remember whether any existing partitions are mounted, for use by need_to_tell_kernel().
+    $hd->{hadMountedPartitions} = 1 if any { $_->{isMounted} } partition_table::get_normal_parts($hd);
+    # Remember whether this was a hybrid ISO so we can wipe the iso9660 signature.
+    $hd->{was_hybrid_iso} = 1 if $hd->{primary}{is_hybrid_iso};
     $hd->{primary} = empty_raw();
     bless $hd, $class;
 }