From 55d7ba758a8a71b9095f78676e5961c6bac9403b Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Fri, 8 Jan 2021 10:51:48 +0100 Subject: [PATCH] - extend use of --root-prefix --- snapper/AppUtil.cc | 10 ++++++---- snapper/Lvm.cc | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc index 01e4fbcf..b78ff302 100644 --- a/snapper/AppUtil.cc +++ b/snapper/AppUtil.cc @@ -147,10 +147,12 @@ namespace snapper string prepend_root_prefix(const string& root_prefix, const string& path) { - if (root_prefix == "/") - return path; - else - return root_prefix + path; + if (root_prefix == "/") + return path; + else if (path == "/") + return root_prefix; + else + return root_prefix + path; } diff --git a/snapper/Lvm.cc b/snapper/Lvm.cc index cb829aac..f2e98abf 100644 --- a/snapper/Lvm.cc +++ b/snapper/Lvm.cc @@ -89,7 +89,7 @@ namespace snapper bool found = false; MtabData mtab_data; - if (!getMtabData(subvolume, found, mtab_data)) + if (!getMtabData(prepend_root_prefix(root_prefix, subvolume), found, mtab_data)) throw InvalidConfigException(); if (!found) -- 2.47.3