From 7215bedd1c8beeef814cd92255bb69622bd823d0 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 13 Sep 2005 16:24:07 +0000
Subject: migrate fstab when upgrading an alien distro (should be done always?)

---
 perl-install/install_any.pm   | 3 ++-
 perl-install/install_steps.pm | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index c1c351405..4cb124916 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -1928,7 +1928,8 @@ sub set_security {
 
 sub write_fstab {
     my ($o) = @_;
-    fs::write_fstab($o->{all_hds}, $o->{prefix}) if !$o->{isUpgrade} || $o->{migrate_device_names};
+    fs::write_fstab($o->{all_hds}, $o->{prefix}) 
+	if !$o->{isUpgrade} || $o->{isUpgrade} =~ /redhat|conectiva/ || $o->{migrate_device_names};
 }
 
 sub move_clp_to_disk {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 9a8930d94..1a9f8aa70 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -197,7 +197,7 @@ sub doPartitionDisksAfter {
 
     fs::set_removable_mntpoints($o->{all_hds});
     fs::mount_options::set_all_default($o->{all_hds}, %$o, lang::fs_options($o->{locale}))
-	if !$o->{isUpgrade};
+	if !$o->{isUpgrade} || $o->{isUpgrade} =~ /redhat|conectiva/;
 
     $o->{fstab} = [ fs::get::fstab($o->{all_hds}) ];
 
-- 
cgit v1.2.1