diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2001-08-21 15:11:49 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2001-08-21 15:11:49 +0000 |
commit | 070210c1e1e4785b38f561f45a4cedc1e15d354f (patch) | |
tree | 61324e57b7ccf161a2a2950038ef607bfca5c3d9 | |
parent | 4ad8c5ab1a5fd776a7146b11b16ca9a1247cd797 (diff) | |
download | drakx-backup-do-not-use-070210c1e1e4785b38f561f45a4cedc1e15d354f.tar drakx-backup-do-not-use-070210c1e1e4785b38f561f45a4cedc1e15d354f.tar.gz drakx-backup-do-not-use-070210c1e1e4785b38f561f45a4cedc1e15d354f.tar.bz2 drakx-backup-do-not-use-070210c1e1e4785b38f561f45a4cedc1e15d354f.tar.xz drakx-backup-do-not-use-070210c1e1e4785b38f561f45a4cedc1e15d354f.zip |
try to fix umount/remounting /tmp/hdimage in hd install
-rw-r--r-- | perl-install/install_steps.pm | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 9f93bc53b..eee7812f4 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -137,11 +137,11 @@ sub doPartitionDisksBefore { sub doPartitionDisksAfter { my ($o) = @_; - install_any::cond_umount_hdimage(); - if (!$::testing) { my $hds = $o->{all_hds}{hds}; + install_any::cond_umount_hdimage(); partition_table::write($_) foreach @$hds; + install_any::cond_remount_hdimage(); $_->{rebootNeeded} and $o->rebootNeeded foreach @$hds; } @@ -169,16 +169,6 @@ sub doPartitionDisksAfter { fs::mount_part($_, $o->{prefix}) foreach grep { $_->{mntpoint} && maybeFormatted($_) } @{$o->{fstab}}; } - if (my $s = delete $o->{stage1_hd}) { - my ($part) = grep { $_->{device} eq $s->{device} } @{$o->{fstab}}; - $part->{isMounted} ? - do { rmdir "/tmp/hdimage" ; symlinkf("$o->{prefix}$part->{mntpoint}", "/tmp/hdimage") } : - eval { - install_any::cond_remount_hdimage($s); - $part->{isMounted} = 1; - }; - } - cat_("/proc/mounts") =~ m|(\S+)\s+/tmp/image nfs| && !grep { $_->{mntpoint} eq "/mnt/nfs" } @{$o->{all_hds}{nfss}} and push @{$o->{all_hds}{nfss}}, { type => 'nfs', mntpoint => "/mnt/nfs", device => $1, options => "noauto,ro,nosuid,rsize=8192,wsize=8192" }; |