From 4cf2b859f4d505f75685d1790e703816f51e8306 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Thu, 15 Oct 2009 16:14:03 +0000
Subject: mount windows partitions under /media instead of /mnt (#53392)

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

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 9acba1d1e..bb734e91a 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
 - finish-install: do not offer to configure 3D desktop if none is
   installed (requires drak3d >= 1.27)
+- mount windows partitions under /media instead of /mnt (#53392)
 
 Version 12.65 - 14 October 2009
 
diff --git a/perl-install/fs/mount_point.pm b/perl-install/fs/mount_point.pm
index 13c913245..6db7575ea 100644
--- a/perl-install/fs/mount_point.pm
+++ b/perl-install/fs/mount_point.pm
@@ -51,11 +51,11 @@ sub suggest_mount_points_always {
     log::l("win parts: ", join ",", map { $_->{device} } @win) if @win;
     if (@win == 1) {
 	#- Suggest /boot/efi on ia64.
-	$win[0]{mntpoint} = arch() =~ /ia64/ ? "/boot/efi" : "/mnt/windows";
+	$win[0]{mntpoint} = arch() =~ /ia64/ ? "/boot/efi" : "/media/windows";
     } else {
 	my %w; foreach (@win) {
 	    my $v = $w{$_->{device_windobe}}++;
-	    $_->{mntpoint} = $_->{unsafeMntpoint} = "/mnt/win_" . lc($_->{device_windobe}) . ($v ? $v+1 : ''); #- lc cuz of StartOffice(!) cf dadou
+	    $_->{mntpoint} = $_->{unsafeMntpoint} = "/media/win_" . lc($_->{device_windobe}) . ($v ? $v+1 : ''); #- lc cuz of StartOffice(!) cf dadou
 	}
     }
 
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index d31032c7b..33b5e463c 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- mount windows partitions under /media instead of /mnt (#53392)
+
 Version 12.65 - 14 October 2009
 
 - do not call obsolete Xconfig::default::config_keyboard function (#54541)
-- 
cgit v1.2.1