From 177f8547e3b99def7e9f9bc0878a151814954857 Mon Sep 17 00:00:00 2001 From: Axel Burri Date: Tue, 8 Feb 2022 01:03:32 +0100 Subject: [PATCH] btrbk: add backend btrfs-progs-doas --- btrbk | 9 +++++---- ssh_filter_btrbk.sh | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/btrbk b/btrbk index 729b6b9..c428909 100755 --- a/btrbk +++ b/btrbk @@ -136,10 +136,10 @@ my %config_options = ( group => { default => undef, accept_regexp => qr/^$group_match($split_match$group_match)*$/, allow_multiple => 1, split => $split_match }, noauto => { default => undef, accept => [ "yes", "no" ] }, - backend => { default => "btrfs-progs", accept => [ "btrfs-progs", "btrfs-progs-btrbk", "btrfs-progs-sudo" ] }, - backend_local => { default => undef, accept => [ "no", "btrfs-progs", "btrfs-progs-btrbk", "btrfs-progs-sudo" ] }, - backend_remote => { default => undef, accept => [ "no", "btrfs-progs", "btrfs-progs-btrbk", "btrfs-progs-sudo" ] }, - backend_local_user => { default => undef, accept => [ "no", "btrfs-progs", "btrfs-progs-btrbk", "btrfs-progs-sudo" ] }, + backend => { default => "btrfs-progs", accept => [ "btrfs-progs", "btrfs-progs-btrbk", "btrfs-progs-sudo", "btrfs-progs-doas" ] }, + backend_local => { default => undef, accept => [ "no", "btrfs-progs", "btrfs-progs-btrbk", "btrfs-progs-sudo", "btrfs-progs-doas" ] }, + backend_remote => { default => undef, accept => [ "no", "btrfs-progs", "btrfs-progs-btrbk", "btrfs-progs-sudo", "btrfs-progs-doas" ] }, + backend_local_user => { default => undef, accept => [ "no", "btrfs-progs", "btrfs-progs-btrbk", "btrfs-progs-sudo", "btrfs-progs-doas" ] }, compat => { default => undef, accept => [ "no", "busybox" ] }, compat_local => { default => undef, accept => [ "no", "busybox" ] }, @@ -325,6 +325,7 @@ my @system_cmd = ( my %backend_cmd_map = ( "btrfs-progs-btrbk" => { map +( $_ => [ s/ /-/gr ] ), @btrfs_cmd }, "btrfs-progs-sudo" => { map +( $_ => [ qw( sudo -n ), split(" ", $_) ] ), @btrfs_cmd, @system_cmd }, + "btrfs-progs-doas" => { map +( $_ => [ qw( doas -n ), split(" ", $_) ] ), @btrfs_cmd, @system_cmd }, ); # keys used in raw target sidecar files (.info): diff --git a/ssh_filter_btrbk.sh b/ssh_filter_btrbk.sh index c1d47b7..5952f2e 100755 --- a/ssh_filter_btrbk.sh +++ b/ssh_filter_btrbk.sh @@ -105,6 +105,7 @@ reject_filtered_cmd() sudo_prefix= for key; do [[ "$key" == "--sudo" ]] && sudo_prefix="sudo -n " + [[ "$key" == "--doas" ]] && sudo_prefix="doas -n " done while [[ "$#" -ge 1 ]]; do @@ -115,7 +116,7 @@ while [[ "$#" -ge 1 ]]; do enable_log=1 ;; - --sudo) + --sudo|--doas) # already processed above ;;