From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 19 Oct 2011 05:29:41 +0000 (+0200)
Subject: fix stdin/sdout redirection
X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=commitdiff_plain;h=f38995ab1443d3ab0ce4b89acc3bf5cb9704ee1c

fix stdin/sdout redirection
---

diff --git a/data/PVE/Tools.pm b/data/PVE/Tools.pm
index 4f85564..4c4e259 100644
--- a/data/PVE/Tools.pm
+++ b/data/PVE/Tools.pm
@@ -225,6 +225,15 @@ sub run_command {
 	    local $ENV{LVM_SUPPRESS_FD_WARNINGS} = "1";
 
 	    $pid = open3($writer, $reader, $error, @$cmd) || die $!;
+
+	    # if we pipe fron STDIN, open3 closes STDIN, so we we
+	    # a perl warning "Filehandle STDIN reopened as GENXYZ .. "
+	    # as soon as we open a new file.
+	    # to avoid that we open /dev/null
+	    if (!ref($writer) && !defined(fileno(STDIN))) {
+		POSIX::close(0);
+		open(STDIN, "</dev/null");
+	    }
 	};
 
 	my $err = $@;
@@ -241,11 +250,13 @@ sub run_command {
 	local $SIG{ALRM} = sub { die "got timeout\n"; } if $timeout;
 	$oldtimeout = alarm($timeout) if $timeout;
 
-	print $writer $input if defined $input;
-	close $writer;
+	if (ref($writer)) {
+	    print $writer $input if defined $input;
+	    close $writer;
+	}
 
 	my $select = new IO::Select;
-	$select->add($reader);
+	$select->add($reader) if ref($reader);
 	$select->add($error);
 
 	my $outlog = '';