From 651a256ee82c18578c3f551e89d3bcadaf68ab43 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 20 Sep 2004 09:46:40 +0000 Subject: - add field {part_number} for partitions (handle it in subpart_from_wild_device_name(), partition_table::read()) - create migrate_device_names() to handle the change of device names when changing kernel&modules (eg: hde->hda or hda->sda) - change prototype of install_any::use_root_part() (prefix is dropped, optional $in is added) - create fs::type::can_be_this_fs_type() and use it - create devices::part_number() and devices::part_prefix() and use them --- perl-install/fs.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'perl-install/fs.pm') diff --git a/perl-install/fs.pm b/perl-install/fs.pm index 8d76939b8..2f8eb0057 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -157,8 +157,14 @@ sub subpart_from_wild_device_name { } $dev =~ s!/(tmp|u?dev)/!!; - my $is_devfs = $dev =~ m!/(disc|part\d+)$!; - $part{$is_devfs ? 'devfs_device' : 'device'} = $dev; + if (my ($is_devfs, $part_number) = $dev =~ m!/(disc|part(\d+))$!) { + $part{part_number} = $part_number if $part_number; + $part{devfs_device} = $dev; + } else { + $part{device} = $dev; + my $part_number = devices::part_number(\%part); + $part{part_number} = $part_number if $part_number; + } return \%part; } elsif ($dev =~ m!^/! && -f "$::prefix$dev") { #- loopback file -- cgit v1.2.1