From 87ef78ed082f9dec4e83a6120b32617b7f7a86b9 Mon Sep 17 00:00:00 2001
From: Mystery Man <unknown@mandriva.org>
Date: Thu, 24 Apr 2003 07:15:38 +0000
Subject: This commit was manufactured by cvs2svn to create tag 'V1_1_9_56mdk'.

---
 perl-install/fs.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 7eaf61711..7c68da790 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -595,7 +595,7 @@ sub real_format_part {
         format_jfs($dev, @options);
     } elsif (isDos($part)) {
         format_dos($dev, @options);
-    } elsif (isWin($part)) {
+    } elsif (isWin($part) || isEfi($part)) {
         format_dos($dev, @options, '-F', 32);
     } elsif (isThisFs('hfs', $part)) {
         format_hfs($dev, @options, '-l', "Untitled");
@@ -737,7 +737,12 @@ sub umount {
     my ($mntpoint) = @_;
     $mntpoint =~ s|/$||;
     log::l("calling umount($mntpoint)");
-    syscall_('umount', $mntpoint) or die _("error unmounting %s: %s", $mntpoint, "$!");
+
+	# SYS_umount is not a valid sycall on modern kernels
+    (arch() =~ /x86_64/
+	 ? syscall_('umount2', $mntpoint, 0)
+	 : syscall_('umount', $mntpoint)
+	 ) or die _("error unmounting %s: %s", $mntpoint, "$!");
 
     substInFile { $_ = '' if /(^|\s)$mntpoint\s/ } '/etc/mtab'; #- don't care about error, if we can't read, we won't manage to write... (and mess mtab)
 }
-- 
cgit v1.2.1