SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

install: Pass in root prefixed path where needed

Browse Source 
The lookup paths are root prefixed in this function, so we need to
pass in the root prefixed path as well to make sure path_is_generator()
does the right thing.

(cherry picked from commit fd6984e2d67fccf54ecf29a3d311e2486423cb98)
This commit is contained in:
Daan De Meyer
2026-10-16 11:36:32 +01:00
committed by Luca Boccassi
parent 3d267223ea
commit e7dc2168e7
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/install.c
+5 -2
View File
@@ -251,6 +251,7 @@ static int path_is_runtime(const LookupPaths *lp, const char *path, bool check_p
static int path_is_vendor_or_generator(const LookupPaths *lp, const char *path) {
const char *rpath;
int r;
assert(lp);
assert(path);
@@ -262,8 +263,10 @@ static int path_is_vendor_or_generator(const LookupPaths *lp, const char *path)
if (path_startswith(rpath, "/usr"))
return true;
if (path_is_generator(lp, rpath))
return true;
/* The lookup paths are root prefixed, so we have to pass in a root prefixed path. */
r = path_is_generator(lp, path);
if (r != 0)
return r;
return path_equal(rpath, SYSTEM_DATA_UNIT_DIR);
}
src/test/test-install-root.c
+17
View File
@@ -777,6 +777,23 @@ TEST(revert) {
ASSERT_STREQ(changes[1].path, p);
install_changes_free(changes, n_changes);
changes = NULL; n_changes = 0;
/* Reverting only removes a unit file in /etc/ if there's another copy to fall back to, either below
* /usr/ or written by a generator. Check that a generated copy counts too, when --root= is specified. */
p = strjoina(root, "/run/systemd/generator/zz.service");
ASSERT_OK(write_string_file(p, "# Empty\n", WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_MKDIR_0755));
p = strjoina(root, SYSTEM_CONFIG_UNIT_DIR"/zz.service");
ASSERT_OK(write_string_file(p, "# Empty override\n", WRITE_STRING_FILE_CREATE));
ASSERT_OK(unit_file_revert(RUNTIME_SCOPE_SYSTEM, root, STRV_MAKE("zz.service"), &changes, &n_changes));
ASSERT_EQ(n_changes, 1u);
ASSERT_EQ(changes[0].type, INSTALL_CHANGE_UNLINK);
ASSERT_STREQ(changes[0].path, p);
install_changes_free(changes, n_changes);
changes = NULL; n_changes = 0;
ASSERT_OK_ERRNO(unlink(strjoina(root, "/run/systemd/generator/zz.service")));
}
TEST(preset_order) {