summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-09-13 16:24:07 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-09-13 16:24:07 +0000
commit7215bedd1c8beeef814cd92255bb69622bd823d0 (patch)
tree3bc32afbf61948d53e0e60347d787ebce6f8338b
parent7ffc57b339ce4bc53e25bff07e0089054c455126 (diff)
downloaddrakx-7215bedd1c8beeef814cd92255bb69622bd823d0.tar
drakx-7215bedd1c8beeef814cd92255bb69622bd823d0.tar.gz
drakx-7215bedd1c8beeef814cd92255bb69622bd823d0.tar.bz2
drakx-7215bedd1c8beeef814cd92255bb69622bd823d0.tar.xz
drakx-7215bedd1c8beeef814cd92255bb69622bd823d0.zip
migrate fstab when upgrading an alien distro (should be done always?)
-rw-r--r--perl-install/install_any.pm3
-rw-r--r--perl-install/install_steps.pm2
2 files changed, 3 insertions, 2 deletions
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}) ];