Merge branch 'maint-4.3'

eucalyptus · Aug 25, 2016 · 278af0d · 278af0d
2 parents 3aa3b55 + 6484869
commit 278af0d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/tools/connect_iscsitarget_main.pl b/tools/connect_iscsitarget_main.pl
@@ -436,17 +436,7 @@ sub setup_virsh_secret {
   $secret .= "  </usage>\n";
 	$secret .= "</secret>\n";
 
-	$secret_path =  $euca_home."/var/lib/eucalyptus/virsh_ceph_secret.xml";
-		  
-	if (open SECRET_FH, ">$secret_path") {
-		print SECRET_FH "$secret";
-		close SECRET_FH;
-	} else {
-		print STDERR "Unable to create $secret_path.\n";
-		do_exit(1);
-	}
-			
-	run_cmd(1, 1, "virsh secret-define --file $secret_path");
+	run_cmd(1, 1, "virsh secret-define --file /dev/stdin", $secret);
 	run_cmd(1, 1, "virsh secret-set-value $uuid --base64 $ceph_key");
 	run_cmd(1, 0, "rm -f $secret_path");
 }

diff --git a/tools/iscsitarget_common.pl b/tools/iscsitarget_common.pl
@@ -60,6 +60,8 @@
 #   IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT
 #   NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS.
 
+use IPC::Open2;
+
 $SK_TARGET = "target";
 $SK_PORTAL = "portal"; # current portal
 $SK_PPORTAL = "pportal"; # persistent portal
@@ -94,8 +96,15 @@ sub sanitize_path {
 }
 
 sub run_cmd {
-  my ($print_on_error, $exit_on_error, $command) = @_;
-  my @outlines = qx($command 2>&1);
+  my ($print_on_error, $exit_on_error, $command, $input) = @_;
+  my $pid = open2(\*OUTPUT, \*INPUT, $command . " 2>&1");
+  if (defined $input) {
+    print INPUT $input;
+  }
+  INPUT->autoflush();
+  close INPUT;
+  my @outlines = <OUTPUT>;
+  waitpid($pid, 0);
   if ($? != 0) {
     check_and_log_fault($command, @outlines);
     $print_on_error and print STDERR "Failed to run '$command': @outlines";
@@ -319,4 +328,3 @@ sub get_disk_by_id_path {
     return "";
   }
 }
-