- move functions using /proc/partitions out of fsedit to fs::proc_partitions

- remove unneeded "use xxx"
- add some "use xxx" (nb: not completly needed because some other modules may do it)

2 files changed, 83 insertions, 0 deletions

diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm
index f59a083f7..358f01e01 100644
--- a/perl-install/fs/mount_options.pm
+++ b/perl-install/fs/mount_options.pm
@@ -5,6 +5,7 @@ use strict;
 
 use common;
 use fs::type;
+use fs::get;
 use log;
 
 sub list() {
diff --git a/perl-install/fs/proc_partitions.pm b/perl-install/fs/proc_partitions.pm
new file mode 100644
index 000000000..3e1e31b32
--- /dev/null
+++ b/perl-install/fs/proc_partitions.pm
@@ -0,0 +1,82 @@
+package fs::proc_partitions; # $Id$
+
+use common;
+
+
+sub read_raw() {
+    my (undef, undef, @all) = cat_("/proc/partitions");
+    grep {
+	$_->{size} != 1 &&	  # skip main extended partition
+	$_->{size} != 0x3fffffff; # skip cdroms (otherwise stops cd-audios)
+    } map { 
+	my %l; 
+	@l{qw(major minor size dev)} = split; 
+	\%l;
+    } @all;
+}
+
+sub read {
+    my ($hds) = @_;
+
+    my @all = read_raw();
+    my ($parts, $disks) = partition { $_->{dev} =~ /\d$/ && $_->{dev} !~ /^(sr|scd)/ } @all;
+
+    my $devfs_like = any { $_->{dev} =~ m|/disc$| } @$disks;
+
+    my %devfs2normal = map {
+	my (undef, $major, $minor) = devices::entry($_->{device});
+	my $disk = find { $_->{major} == $major && $_->{minor} == $minor } @$disks;
+	$disk->{dev} => $_->{device};
+    } @$hds;
+
+    my $prev_part;
+    foreach my $part (@$parts) {
+	my $dev;
+	if ($devfs_like) {
+	    $dev = -e "/dev/$part->{dev}" ? $part->{dev} : sprintf("0x%x%02x", $part->{major}, $part->{minor});
+	    $part->{rootDevice} = $devfs2normal{dirname($part->{dev}) . '/disc'};
+	} else {
+	    $dev = $part->{dev};
+	    if (my $hd = find { $part->{dev} =~ /^\Q$_->{device}\E./ } @$hds) {
+		put_in_hash($part, partition_table::hd2minimal_part($hd));
+	    }
+	}
+	undef $prev_part if $prev_part && ($prev_part->{rootDevice} || '') ne ($part->{rootDevice} || '');
+
+	$part->{device} = $dev;
+	$part->{size} *= 2;	# from KB to sectors
+	$part->{start} = $prev_part ? $prev_part->{start} + $prev_part->{size} : 0;
+	require fs::type;
+	put_in_hash($part, fs::type::type_subpart_from_magic($part));
+	$prev_part = $part;
+	delete $part->{dev}; # cleanup
+    }
+    @$parts;
+}
+
+sub compare {
+    my ($hd) = @_;
+
+    my @l1 = partition_table::get_normal_parts($hd);
+    my @l2 = grep { $_->{rootDevice} eq $hd->{device} } read([$hd]);
+
+    #- /proc/partitions includes partition with type "empty" and a non-null size
+    #- so add them for comparison
+    my ($len1, $len2) = (int(@l1) + $hd->{primary}{nb_special_empty}, int(@l2));
+
+    if ($len1 != $len2 && arch() ne 'ppc') {
+	die sprintf(
+		    "/proc/partitions does not agree with drakx %d != %d:\n%s\n", $len1, $len2,
+		    "/proc/partitions: " . join(", ", map { "$_->{device} ($_->{rootDevice})" } @l2));
+    }
+    $len2;
+}
+
+sub use_ {
+    my ($hd) = @_;
+    
+    partition_table::raw::zero_MBR($hd);
+    $hd->{readonly} = 1;
+    $hd->{getting_rid_of_readonly_allowed} = 1;
+    $hd->{primary} = { normal => [ grep { $_->{rootDevice} eq $hd->{device} } read([$hd]) ] };
+}