diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-01-31 14:25:28 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-01-31 14:25:28 +0000 |
| commit | 032dd82bc486aafc4647edc3442f1e5f431525dd (patch) | |
| tree | e02c96a92878e9130121b5c16f08db4f9cbd5e0e | |
| parent | bb1ba670a8b075d2d5c12d2263d3b190e4f05b8d (diff) | |
| download | drakx-backup-do-not-use-032dd82bc486aafc4647edc3442f1e5f431525dd.tar drakx-backup-do-not-use-032dd82bc486aafc4647edc3442f1e5f431525dd.tar.gz drakx-backup-do-not-use-032dd82bc486aafc4647edc3442f1e5f431525dd.tar.bz2 drakx-backup-do-not-use-032dd82bc486aafc4647edc3442f1e5f431525dd.tar.xz drakx-backup-do-not-use-032dd82bc486aafc4647edc3442f1e5f431525dd.zip | |
- do not write_partitions when resizing & loosing data (not needed)
- handle "cancel" on write_partitions
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index 3f3465254..0dd1526d4 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -704,15 +704,16 @@ sub Resize { my ($write_partitions) = @_; if (isLVM($hd)) { - lvm::lv_resize($part, $oldsize) - } else { - partition_table::adjust_local_extended($hd, $part); - partition_table::adjust_main_extended($hd); - write_partitions($in, $hd) if $write_partitions; - } + lvm::lv_resize($part, $oldsize) ; + } else { + partition_table::adjust_local_extended($hd, $part); + partition_table::adjust_main_extended($hd); + write_partitions($in, $hd) or return if $write_partitions && %nice_resize; + } + 1; }; - $adjust->(1) if $size > $oldsize; + $adjust->(1) or return if $size > $oldsize; if ($nice_resize{fat}) { local *log::l = sub { $w->set(join(' ', @_)) }; |