try to fix umount/remounting /tmp/hdimage in hd install

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" };