diff options
| author | Mystery Man <unknown@mandriva.org> | 2003-08-20 07:37:27 +0000 |
|---|---|---|
| committer | Mystery Man <unknown@mandriva.org> | 2003-08-20 07:37:27 +0000 |
| commit | 7f2ac73888b8ef372ea597049981b27e7d810ac2 (patch) | |
| tree | 354132889b63bbe5f446cb82869b3c3367135a80 /perl-install/fs.pm | |
| parent | 327bd24f8e4291bd1882de1990dd7339f781a9cb (diff) | |
| download | drakx-7f2ac73888b8ef372ea597049981b27e7d810ac2.tar drakx-7f2ac73888b8ef372ea597049981b27e7d810ac2.tar.gz drakx-7f2ac73888b8ef372ea597049981b27e7d810ac2.tar.bz2 drakx-7f2ac73888b8ef372ea597049981b27e7d810ac2.tar.xz drakx-7f2ac73888b8ef372ea597049981b27e7d810ac2.zip | |
This commit was manufactured by cvs2svn to create branch 'MDKC_1_0'.topic/MDKC_1_0
Diffstat (limited to 'perl-install/fs.pm')
| -rw-r--r-- | perl-install/fs.pm | 9 |
1 files changed, 7 insertions, 2 deletions
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) } |