summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-08-08 01:19:14 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-08-08 01:19:14 +0000
commit328d93c8b3ed7a78f069e8a7ba7b8cdf92554d7c (patch)
treeb4273d284469c89f8e51be68b9e62ef0be1d7bfa
parent6ea9e9a31caf8aca895d66e962dd187c12544e68 (diff)
downloaddrakx-328d93c8b3ed7a78f069e8a7ba7b8cdf92554d7c.tar
drakx-328d93c8b3ed7a78f069e8a7ba7b8cdf92554d7c.tar.gz
drakx-328d93c8b3ed7a78f069e8a7ba7b8cdf92554d7c.tar.bz2
drakx-328d93c8b3ed7a78f069e8a7ba7b8cdf92554d7c.tar.xz
drakx-328d93c8b3ed7a78f069e8a7ba7b8cdf92554d7c.zip
have the ability to prefer primary partitions in auto_installs
-rw-r--r--perl-install/fsedit.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 241354563..cbe94f5c1 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -360,7 +360,7 @@ sub suggest_part {
$part->{mntpoint} = $best->{mntpoint};
fs::type::set_type_subpart($part, $best) if !isTrueFS($best) || !isTrueFS($part);
$part->{size} = computeSize($part, $best, $all_hds, \@local_suggestions);
- foreach ('options', 'lv_name', 'encrypt_key', 'device_LABEL', 'prefer_device_LABEL') {
+ foreach ('options', 'lv_name', 'encrypt_key', 'device_LABEL', 'prefer_device_LABEL', 'primaryOrExtended') {
$part->{$_} = $best->{$_} if $best->{$_};
}
1;
@@ -433,7 +433,7 @@ sub allocatePartitions {
while (suggest_part($part = { start => $start, size => 0, maxsize => $size, rootDevice => $dev },
$all_hds, $to_add)) {
my $hd = fs::get::part2hd($part, $all_hds);
- add($hd, $part, $all_hds, {});
+ add($hd, $part, $all_hds, { primaryOrExtended => $part->{primaryOrExtended} });
$size -= $part->{size} + $part->{start} - $start;
$start = $part->{start} + $part->{size};
}