diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-08-18 04:32:24 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-08-18 04:32:24 +0000 |
| commit | 94f257d030c1fd411ec48e438db18c657cd97e40 (patch) | |
| tree | a4537ad6b19dde305ee0422c7b6a8c4ce104dd9b /perl-install/install_steps.pm | |
| parent | 3441ffe13a56f8b565e950b1c8e40c70b2acd97a (diff) | |
| download | drakx-94f257d030c1fd411ec48e438db18c657cd97e40.tar drakx-94f257d030c1fd411ec48e438db18c657cd97e40.tar.gz drakx-94f257d030c1fd411ec48e438db18c657cd97e40.tar.bz2 drakx-94f257d030c1fd411ec48e438db18c657cd97e40.tar.xz drakx-94f257d030c1fd411ec48e438db18c657cd97e40.zip | |
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
| -rw-r--r-- | perl-install/install_steps.pm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 709764a1e..fb7d24f4c 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -127,7 +127,7 @@ sub setupSCSI { sub doPartitionDisksBefore { my ($o) = @_; - if (cat_("/proc/mounts") =~ m|/\w+/(\S+)\s+/tmp/hdimage\s+(\S+)|) { + if (cat_("/proc/mounts") =~ m|/\w+/(\S+)\s+/tmp/hdimage\s+(\S+)| && !$o->{partitioning}{readonly}) { $o->{stage1_hd} = { dev => $1, fs => $2 }; install_any::getFile("XXX"); #- close still opened filehandle eval { fs::umount("/tmp/hdimage") }; @@ -159,7 +159,15 @@ sub doPartitionDisksAfter { #------------------------------------------------------------------------------ sub doPartitionDisks { - my ($o, $hds) = @_; + my ($o) = @_; + + if ($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->{hds}, $o->{prefix})) or die; + install_any::use_root_part($o->{fstab}, $p, $o->{prefix}); + } else { + #TODO; + } } #------------------------------------------------------------------------------ |