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; fs::get_major_minor($hds); my $prev_part; foreach my $part (@$parts) { my $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) = @_; eval { $hd->isa('partition_table::lvm') } and return; 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) { if (find { $_->{pt_type} == 0xbf } @l1) { log::l("not using /proc/partitions because of the presence of solaris extended partition"); #- cf #33866 } else { 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) = @_; require partition_table::readonly; partition_table::readonly->initialize($hd, [ grep { $_->{rootDevice} eq $hd->{device} } &read([$hd]) ]); } 1; pdate Mageia Installer and base platform for many utilitiesThierry Vignaud [tv]
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Villard <warly@mandriva.com>2004-01-22 14:11:51 +0000
committerFlorent Villard <warly@mandriva.com>2004-01-22 14:11:51 +0000
commitc3ba0dbe6d8cd987f3e69baf2d935a34f65db6f0 (patch)
tree226040d0ef5f572bbb23b5391a03fd96e4fb3da6
parentb7d1f1182dc4bfc73742f1230d5ebf0fbd9adb4e (diff)
downloaddrakx-c3ba0dbe6d8cd987f3e69baf2d935a34f65db6f0.tar
drakx-c3ba0dbe6d8cd987f3e69baf2d935a34f65db6f0.tar.gz
drakx-c3ba0dbe6d8cd987f3e69baf2d935a34f65db6f0.tar.bz2
drakx-c3ba0dbe6d8cd987f3e69baf2d935a34f65db6f0.tar.xz
drakx-c3ba0dbe6d8cd987f3e69baf2d935a34f65db6f0.zip
new progress bar layout
Diffstat
-rwxr-xr-xmake_boot_img2
1 files changed, 1 insertions, 1 deletions
diff --git a/make_boot_img b/make_boot_img
index 7fe701321..1784a06a4 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -625,7 +625,7 @@ sub isolinux {
#- for old style pictures (9.1 and previous)
# lilo-bmp2mdk mode:0x103 progress:425,173,16,7,64+21 clear:600,800,64+59 pos:0,0 <isolinux-graphic.bmp >isolinux/boot.msg
#- for current 9.2 pictures.
- _ "lilo-bmp2mdk mode:0x103 progress:405,166,4,14,64+26 clear:600,800,64+127 pos:0,0 <isolinux-graphic.bmp >isolinux/boot.msg";
+ _ "lilo-bmp2mdk mode:0x103 progress:405,166,11,6,64+29 clear:600,800,64+126 pos:0,0 <isolinux-graphic.bmp >isolinux/boot.msg";
}
_ "cp /usr/lib/syslinux/isolinux.bin isolinux/isolinux.bin";
output "isolinux/isolinux.cfg", "