yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "esxi: improve error handling for fuse mount tool"

Browse Source 
This reverts commit d80420bca8.

This diverts stderr of the fuse process to a pipe, which makes no
sense as it runs daemonized in a scope, also, the pipe fd was used as
a ready-signal, which now does not trigger anymore.
This commit is contained in:
Wolfgang Bumiller
2024-06-21 13:46:36 +02:00
parent 6d7dcb575b
commit 9a594f594d
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/PVE/Storage/ESXiPlugin.pm
View File

@ -222,9 +222,6 @@ sub esxi_mount : prototype($$$;$) {
// die "failed to get file descriptor flags: $!\n"; // die "failed to get file descriptor flags: $!\n";
fcntl($wr, F_SETFD, $flags & ~FD_CLOEXEC) fcntl($wr, F_SETFD, $flags & ~FD_CLOEXEC)
// die "failed to remove CLOEXEC flag from fd: $!\n"; // die "failed to remove CLOEXEC flag from fd: $!\n";
open(STDERR, ">&", $wr) or die "unable to redirect STDERR: $!\n";
# FIXME: use the user/group options! # FIXME: use the user/group options!
exec {$ESXI_FUSE_TOOL} exec {$ESXI_FUSE_TOOL}
$ESXI_FUSE_TOOL, $ESXI_FUSE_TOOL,
@ -248,7 +245,7 @@ sub esxi_mount : prototype($$$;$) {
undef $wr; undef $wr;
my $result = do { local $/ = undef; <$rd> }; my $result = do { local $/ = undef; <$rd> };
if ($result =~ /^ERROR: (.*)$/i) { if ($result =~ /^ERROR: (.*)$/) {
die "$1\n"; die "$1\n";
} }