diff options
author | Olivier Blin <oblin@mandriva.com> | 2009-06-29 13:13:23 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.com> | 2009-06-29 13:13:23 +0000 |
commit | 94133e91e21fb060848e2a08947563dd37e1d46d (patch) | |
tree | 43e08799cd171a87017795a998fa6917260c5865 | |
parent | 94bdc0cab5bb8d33fee6b388f9eb9da23c173248 (diff) | |
download | drakiso-94133e91e21fb060848e2a08947563dd37e1d46d.tar drakiso-94133e91e21fb060848e2a08947563dd37e1d46d.tar.gz drakiso-94133e91e21fb060848e2a08947563dd37e1d46d.tar.bz2 drakiso-94133e91e21fb060848e2a08947563dd37e1d46d.tar.xz drakiso-94133e91e21fb060848e2a08947563dd37e1d46d.zip |
pass partition index when allocation partition
-rwxr-xr-x | draklive | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -656,8 +656,9 @@ sub get_disk_master_path { } sub allocate_partition { - my ($dest, $sector_size, $fs, $o_inode_size) = @_; - my ($part_start, $part_nb_sectors) = run_program::get_stdout("sfdisk -d $dest") =~ /start=\s*(\d+),\s*size=\s*(\d+)/; + my ($dest, $part_idx, $sector_size, $fs, $o_inode_size) = @_; + my @parts = group_by2(run_program::get_stdout("sfdisk -d $dest") =~ /start=\s*(\d+),\s*size=\s*(\d+)/g); + my ($part_start, $part_nb_sectors) = @{$parts[$part_idx]}; require devices; my $loop = devices::find_free_loop(); @@ -702,7 +703,7 @@ EOF close($fdisk) or die "unable to run fdisk\n" . ("$!" ? "Error closing fdisk pipe: $!" : "Exit status $? from fdisk"); my $inode_size = $media->get_media_setting('inode_size'); - return allocate_partition($dest, $sector_size, $fs, $inode_size); + return allocate_partition($dest, 0, $sector_size, $fs, $inode_size); } sub create_disk_master { |