diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-01-05 20:55:20 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-01-05 20:55:20 +0000 |
| commit | fd6b89e3d9cb165829a25cd196b5340104a4e440 (patch) | |
| tree | c14cf6f6d8be04fa8cdfe65fc8e68411b399e757 /perl-install/install2.pm | |
| parent | 49a8229d69ae7b82dff1417857285f5f0a73f43f (diff) | |
| download | drakx-backup-do-not-use-fd6b89e3d9cb165829a25cd196b5340104a4e440.tar drakx-backup-do-not-use-fd6b89e3d9cb165829a25cd196b5340104a4e440.tar.gz drakx-backup-do-not-use-fd6b89e3d9cb165829a25cd196b5340104a4e440.tar.bz2 drakx-backup-do-not-use-fd6b89e3d9cb165829a25cd196b5340104a4e440.tar.xz drakx-backup-do-not-use-fd6b89e3d9cb165829a25cd196b5340104a4e440.zip | |
no_comment
Diffstat (limited to 'perl-install/install2.pm')
| -rw-r--r-- | perl-install/install2.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 8c5a0c085..464024e68 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -284,6 +284,8 @@ sub partitionDisks { ] if $o->{lnx4win}; return if $o->{isUpgrade}; + ($o->{hd_dev}) = cat_("/proc/mounts") =~ m|/tmp/(\S+)\s+/tmp/hdimage|; + $::o->{steps}{formatPartitions}{done} = 0; eval { fs::umount_all($o->{fstab}, $o->{prefix}) } if $o->{fstab} && !$::testing; @@ -323,7 +325,7 @@ sub formatPartitions { $o->formatPartitions(@{$o->{fstab}}); fs::mount_all([ grep { isSwap($_) } @{$o->{fstab}} ], $o->{prefix}); die _("Not enough swap to fulfill installation, please add some") if availableMemory < 40 * 1024; - fs::mount_all([ grep { isExt2($_) } @{$o->{fstab}} ], $o->{prefix}); + fs::mount_all([ grep { isExt2($_) } @{$o->{fstab}} ], $o->{prefix}, $o->{hd_dev}); } eval { $o = $::o = install_any::loadO($o) } if $_[1] == 1; |