diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-03-06 13:22:53 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-03-06 13:22:53 +0000 |
| commit | b33fc1ae460ebdeba76a5fe663c6d7ee3de067a8 (patch) | |
| tree | 9e774cb9bdebe7372807871143223ef3517703b6 | |
| parent | 62467339503b9b07050b7626374ff04f851c0d1b (diff) | |
| download | drakx-b33fc1ae460ebdeba76a5fe663c6d7ee3de067a8.tar drakx-b33fc1ae460ebdeba76a5fe663c6d7ee3de067a8.tar.gz drakx-b33fc1ae460ebdeba76a5fe663c6d7ee3de067a8.tar.bz2 drakx-b33fc1ae460ebdeba76a5fe663c6d7ee3de067a8.tar.xz drakx-b33fc1ae460ebdeba76a5fe663c6d7ee3de067a8.zip | |
ensure the fstab is kept on upgrade
| -rw-r--r-- | perl-install/install_any.pm | 3 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index fe6f2033e..befeeedcf 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -903,7 +903,8 @@ sub find_root_parts { } @$fstab; } sub use_root_part { - my ($fstab, $part, $prefix) = @_; + my ($all_hds, $part, $prefix) = @_; + my $fstab = [ fsedit::get_really_all_fstab($all_hds) ]; { my $handle = any::inspect($part, $prefix) or die; fs::merge_info_from_fstab($fstab, $handle->{dir}, 'uniq'); diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index e132b8f8c..65e16215f 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -183,7 +183,7 @@ sub doPartitionDisks { if ($o->{partitioning}{use_existing_root} || $o->{isUpgrade}) { # either one root is defined (and all is ok), or we take the first one we find my $p = fsedit::get_root_($o->{fstab}) || first(install_any::find_root_parts($o->{fstab}, $o->{prefix})) or die; - install_any::use_root_part($o->{fstab}, $p, $o->{prefix}); + install_any::use_root_part($o->{all_hds}, $p, $o->{prefix}); } if ($o->{partitioning}{auto_allocate}) { fsedit::auto_allocate($o->{all_hds}, $o->{partitions}); diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 029f1ac89..27e4a5e0b 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -397,7 +397,7 @@ Continue at your own risk!")); _("What is the root partition (/) of your system?"), \&partition_table::description, \@l) or die "setstep exitInstall\n"; } - install_any::use_root_part($o->{fstab}, $p, $o->{prefix}); + install_any::use_root_part($o->{all_hds}, $p, $o->{prefix}); } elsif ($::expert && $o->isa('interactive_gtk')) { install_interactive::partition_with_diskdrake($o, $o->{all_hds}); } else { |