diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-09-03 12:23:49 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-09-03 12:23:49 +0000 |
| commit | df097c88179d6241e0f8155f56e6c6fdbecb344a (patch) | |
| tree | c620e4a569d86ae41b17edc831e2973749f6b9e9 | |
| parent | 25a3b43460e0f3173640e187903257c423e9d688 (diff) | |
| download | drakx-backup-do-not-use-df097c88179d6241e0f8155f56e6c6fdbecb344a.tar drakx-backup-do-not-use-df097c88179d6241e0f8155f56e6c6fdbecb344a.tar.gz drakx-backup-do-not-use-df097c88179d6241e0f8155f56e6c6fdbecb344a.tar.bz2 drakx-backup-do-not-use-df097c88179d6241e0f8155f56e6c6fdbecb344a.tar.xz drakx-backup-do-not-use-df097c88179d6241e0f8155f56e6c6fdbecb344a.zip | |
fix switching to 0x85 extended when remove_empty_extended is called
| -rw-r--r-- | perl-install/partition_table.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm index 16d6da39f..1cd6ede24 100644 --- a/perl-install/partition_table.pm +++ b/perl-install/partition_table.pm @@ -365,11 +365,11 @@ sub remove_empty_extended { } $_->{normal}; } @{$hd->{extended}}; - adjust_main_extended($hd); + adjust_main_extended($hd, 1); } sub adjust_main_extended { - my ($hd) = @_; + my ($hd, $no_auto_win_extended) = @_; if (!is_empty_array_ref $hd->{extended}) { my ($l, @l) = @{$hd->{extended}}; @@ -386,7 +386,7 @@ sub adjust_main_extended { } $l->{start} = $hd->{primary}{extended}{start} = $start; $l->{size} = $hd->{primary}{extended}{size} = $end - $start; - $hd->{primary}{extended}{type} = $only_linux ? 0x85 : $has_win_lba ? 0xf : 0x5 if !$::expert; + $hd->{primary}{extended}{type} = $only_linux ? 0x85 : $has_win_lba ? 0xf : 0x5 if !$::expert && !$no_auto_win_extended; } unless (@{$hd->{extended} || []} || !$hd->{primary}{extended}) { %{$hd->{primary}{extended}} = (); #- modify the raw entry |