X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fshellcommands.pm;h=418ff14ac15d247d7de440add0b0681526a6d42a;hp=4d603cbd2c76cc94f0705d1bb1214b9b53648803;hb=09df4e8790fe3ed8e233d2c198ea524465c0096e;hpb=77a7c7cbb3852480ec38f83b95237cefaa8483ed

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 4d603cbd2..418ff14ac 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -80,7 +80,11 @@ tie my %options, 'Tie::IxHash',
                              'Radius group mapping to reason (via template user)',
 			    type  => 'textarea',
 			  },
-  'ignored_errors' => { label   => 'Regexes of errors to ignore, separated by newlines',
+  'ignore_all_output' => { 
+      label => 'Ignore all output and errors from the command',
+      type  => 'checkbox',
+  },
+  'ignored_errors' => { label   => 'Regexes of specific errors to ignore, separated by newlines',
                         type    => 'textarea'
                       },
 #  'no_queue' => { label => 'Run command immediately',
@@ -354,7 +358,8 @@ sub _export_command {
     host          => $self->machine,
     command       => $command_string,
     stdin_string  => $stdin_string,
-    ignored_errors => $self->option('ignored_errors') || '',
+    ignore_all_output => $self->option('ignore_all_output'),
+    ignored_errors    => $self->option('ignored_errors') || '',
   );
 
   if($self->option($action . '_no_queue')) {
@@ -447,6 +452,7 @@ sub _export_replace {
     host          => $self->machine,
     command       => $command_string,
     stdin_string  => $stdin_string,
+    ignore_all_output => $self->option('ignore_all_output'),
     ignored_errors => $self->option('ignored_errors') || '',
   );
 
@@ -475,13 +481,19 @@ sub shellcommands_queue {
 sub ssh_cmd { #subroutine, not method
   use Net::OpenSSH;
   my $opt = { @_ };
-  my $ssh = Net::OpenSSH->new($opt->{'user'}.'@'.$opt->{'host'});
+  open my $def_in, '<', '/dev/null' or die "unable to open /dev/null\n";
+  my $ssh = Net::OpenSSH->new(
+    $opt->{'user'}.'@'.$opt->{'host'},
+    'default_stdin_fh' => $def_in
+  );
+  # ignore_all_output doesn't override this
   die "Couldn't establish SSH connection: ". $ssh->error if $ssh->error;
 
   my $ssh_opt = {};
   $ssh_opt->{'stdin_data'} = $opt->{'stdin_string'}
-    if exists($opt->{'stdin_string'});
+    if exists($opt->{'stdin_string'}) and length($opt->{'stdin_string'});
   my ($output, $errput) = $ssh->capture2($ssh_opt, $opt->{'command'});
+  return if $opt->{'ignore_all_output'};
   die "Error running SSH command: ". $ssh->error if $ssh->error;
 
   if ($errput && $opt->{'ignored_errors'} && length($opt->{'ignored_errors'})) {