From 032dd82bc486aafc4647edc3442f1e5f431525dd Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 31 Jan 2003 14:25:28 +0000
Subject: - do not write_partitions when resizing & loosing data (not needed) -
 handle "cancel" on write_partitions

---
 perl-install/diskdrake/interactive.pm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'perl-install/diskdrake/interactive.pm')

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(' ', @_)) };
-- 
cgit v1.2.1