From a458b3d82228e786ec0c7e44444ee41ba0d85279 Mon Sep 17 00:00:00 2001 From: boerwastaken Date: Mon, 4 Sep 2017 11:43:48 +0900 Subject: [PATCH 1/2] make SSH minimally chatty, fixes digint/btrbk#179 --- btrbk | 1 + 1 file changed, 1 insertion(+) diff --git a/btrbk b/btrbk index 8e39a49..059870d 100755 --- a/btrbk +++ b/btrbk @@ -1829,6 +1829,7 @@ sub vinfo_rsh($;@) my @ssh_options; push(@ssh_options, '-p', $ssh_port) if($ssh_port ne "default"); push(@ssh_options, '-c', $ssh_cipher_spec) if($ssh_cipher_spec ne "default"); + push(@ssh_options, '-q'); if($ssh_identity) { push(@ssh_options, '-i', $ssh_identity); } else { From 97516081fd0a3c2a4948850a4901b64fde6bb5db Mon Sep 17 00:00:00 2001 From: boerwastaken Date: Mon, 4 Sep 2017 11:47:50 +0900 Subject: [PATCH 2/2] respect $PATH (and disable taint mode as per discussion) fixes digint/btrbk#178 --- btrbk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/btrbk b/btrbk index 059870d..a82e832 100755 --- a/btrbk +++ b/btrbk @@ -1,4 +1,4 @@ -#!/usr/bin/perl -T +#!/usr/bin/env perl # # btrbk - Create snapshots and remote backups of btrfs subvolumes # @@ -3691,11 +3691,6 @@ sub exit_status MAIN: { - # set PATH instead of using absolute "/sbin/btrfs" (for now), as - # different distros (and even different versions of btrfs-progs) - # install the "btrfs" executable to different locations. - $ENV{PATH} = '/sbin:/bin:/usr/sbin:/usr/bin'; - Getopt::Long::Configure qw(gnu_getopt); my $start_time = time; @tm_now = localtime($start_time);