From 6cd7b39cff3817790254a85c61684c471e48a306 Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Mon, 7 Apr 2025 10:06:36 +0200 Subject: [PATCH] - use correct btrfs binary for target commands in snbk --- client/snbk/TheBigThing.cc | 7 ++++--- package/snapper.changes | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/client/snbk/TheBigThing.cc b/client/snbk/TheBigThing.cc index c3a6b2c2..fda469b2 100644 --- a/client/snbk/TheBigThing.cc +++ b/client/snbk/TheBigThing.cc @@ -144,7 +144,8 @@ namespace snapper to_string(it1->num) + "/" SNAPSHOT_NAME; cmd3a_args << "--" << backup_config.source_path + "/" SNAPSHOTS_NAME "/" + num_string + "/" SNAPSHOT_NAME; - SystemCmd::Args cmd3b_args = { BTRFS_BIN, "receive", "--", backup_config.target_path + "/" + num_string }; + SystemCmd::Args cmd3b_args = { backup_config.target_btrfs_bin, "receive", "--", + backup_config.target_path + "/" + num_string }; y2deb("source: " << cmd3a_args.get_values()); y2deb("target: " << cmd3b_args.get_values()); @@ -178,8 +179,8 @@ namespace snapper // Delete snapshot on target. - SystemCmd::Args cmd1_args = { BTRFS_BIN, "subvolume", "delete", "--", backup_config.target_path + "/" + - num_string + "/" SNAPSHOT_NAME }; + SystemCmd::Args cmd1_args = { backup_config.target_btrfs_bin, "subvolume", "delete", "--", + backup_config.target_path + "/" + num_string + "/" SNAPSHOT_NAME }; SystemCmd cmd1(shellify(backup_config.get_target_shell(), cmd1_args)); if (cmd1.retcode() != 0) { diff --git a/package/snapper.changes b/package/snapper.changes index 1126734a..547e1cfb 100644 --- a/package/snapper.changes +++ b/package/snapper.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 07 10:05:23 CEST 2025 - aschnell@suse.com + +- use correct btrfs binary for target commands in snbk + (gh#openSUSE/snapper#998) + ------------------------------------------------------------------- Tue Feb 04 10:10:41 CET 2025 - aschnell@suse.com -- 2.47.3