From 2ec543bbff01fe789af15b9623b5be2c39bcaebd Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 20 Aug 2001 16:27:57 +0000
Subject: try harder to umount /tmp/hdimage only when needed

---
 perl-install/install_any.pm | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'perl-install/install_any.pm')

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index bba61987d..f3b6f9be1 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -1046,6 +1046,17 @@ sub remove_bigseldom_used {
       );
 }
 
+sub cond_umount_hdimage() {
+    if (cat_("/proc/mounts") =~ m|/\w+/(\S+)\s+/tmp/hdimage\s+(\S+)| && !$::o->{partitioning}{readonly}) {
+	$::o->{stage1_hd} = { device => $1, type => $2 };
+	getFile("XXX"); #- close still opened filehandle
+	eval { fs::umount("/tmp/hdimage") };
+    }
+}
+sub cond_remount_hdimage {
+    my $s = shift || delete $::o->{stage1_hd} or return;
+    fs::mount($s->{device}, '/tmp/hdimage', $s->{type});
+}
 
 ################################################################################
 package pkgs_interactive;
-- 
cgit v1.2.1