From 8a6ffb9eee88fdbaa947590ee92fa95f53cc7b48 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Thu, 4 Feb 2010 11:16:45 +0000
Subject: - partitioning wizard:   o offer to install on dmraid (instead of
 crashing if no other disk)   o offer to install on existing lvm   o suggest
 non-removable disks first   o unmount swap too when unmounting all partitions

---
 perl-install/fs/mount.pm               | 2 +-
 perl-install/fs/partitioning_wizard.pm | 4 +++-
 perl-install/install/NEWS              | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/perl-install/fs/mount.pm b/perl-install/fs/mount.pm
index f7bea2ae4..59e3e8bbb 100644
--- a/perl-install/fs/mount.pm
+++ b/perl-install/fs/mount.pm
@@ -222,7 +222,7 @@ sub umount_all {
     log::l("unmounting all filesystems");
 
     foreach (sort { $b->{mntpoint} cmp $a->{mntpoint} } 
-	       grep { $_->{mntpoint} && !$_->{real_mntpoint} } @$fstab) {
+	       grep { $_->{mntpoint} && !$_->{real_mntpoint} || isSwap($_) } @$fstab) {
 	umount_part($_);
     }
 }
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index 2a354bfaf..21890ad91 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -502,7 +502,9 @@ sub main {
 
         my $mainbox = Gtk2::VBox->new;
 
-        my @kinds = map { diskdrake::hd_gtk::hd2kind($_) } @{$all_hds->{hds}};
+        my @kinds = map { diskdrake::hd_gtk::hd2kind($_) } sort { $a->{is_removable} <=> $b->{is_removable} } @{$all_hds->{hds} };
+        push @kinds, map { diskdrake::hd_gtk::raid2kind($_) } @{$all_hds->{raids}};
+        push @kinds, map { diskdrake::hd_gtk::lvm2kind($_) } @{$all_hds->{lvms}};
 
         my $hdchoice = Gtk2::HBox->new;
 
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index bf878158f..af8fa7079 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -5,6 +5,11 @@
 - detect_devices:
   o fix detecting pcmcia serial devices
 - support ddf1 raid
+- partitioning wizard: 
+  o offer to install on dmraid (instead of crashing if no other disk) 
+  o offer to install on existing lvm 
+  o suggest non-removable disks first
+  o unmount swap too when unmounting all partitions
 
 Version 12.77 - 30 October 2009
 
-- 
cgit v1.2.1