diff options
Diffstat (limited to 'sys-apps/systemd/files/255-analyze-regression.patch')
| -rw-r--r-- | sys-apps/systemd/files/255-analyze-regression.patch | 156 |
1 files changed, 0 insertions, 156 deletions
diff --git a/sys-apps/systemd/files/255-analyze-regression.patch b/sys-apps/systemd/files/255-analyze-regression.patch deleted file mode 100644 index cba6a479f1a7..000000000000 --- a/sys-apps/systemd/files/255-analyze-regression.patch +++ /dev/null @@ -1,156 +0,0 @@ -Fixes a regression in the git test suite. - -https://lore.kernel.org/git/20231207062752.GA777253@coredump.intra.peff.net/T/#t -https://github.com/systemd/systemd/issues/30357 -https://github.com/systemd/systemd/pull/30363 -https://github.com/systemd/systemd/commit/bf8726d1ee33047b138f677fe4c72ca9989680e8 - -From 6d9d55657946385916fa4db7149a9b389645ee73 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe <watanabe.yu+github@gmail.com> -Date: Thu, 7 Dec 2023 19:29:29 +0900 -Subject: [PATCH 1/2] analyze: also find template unit when a template instance - is specified - -Fixes a regression caused by 2f6181ad4d6c126e3ebf6880ba30b3b0059c6fc8. - -Fixes #30357. - -Co-authored-by: Jeff King <peff@peff.net> ---- a/src/analyze/analyze-verify-util.c -+++ b/src/analyze/analyze-verify-util.c -@@ -72,6 +72,54 @@ int verify_prepare_filename(const char *filename, char **ret) { - return 0; - } - -+static int find_unit_directory(const char *p, char **ret) { -+ _cleanup_free_ char *a = NULL, *u = NULL, *t = NULL, *d = NULL; -+ int r; -+ -+ assert(p); -+ assert(ret); -+ -+ r = path_make_absolute_cwd(p, &a); -+ if (r < 0) -+ return r; -+ -+ if (access(a, F_OK) >= 0) { -+ r = path_extract_directory(a, &d); -+ if (r < 0) -+ return r; -+ -+ *ret = TAKE_PTR(d); -+ return 0; -+ } -+ -+ r = path_extract_filename(a, &u); -+ if (r < 0) -+ return r; -+ -+ if (!unit_name_is_valid(u, UNIT_NAME_INSTANCE)) -+ return -ENOENT; -+ -+ /* If the specified unit is an instance of a template unit, then let's try to find the template unit. */ -+ r = unit_name_template(u, &t); -+ if (r < 0) -+ return r; -+ -+ r = path_extract_directory(a, &d); -+ if (r < 0) -+ return r; -+ -+ free(a); -+ a = path_join(d, t); -+ if (!a) -+ return -ENOMEM; -+ -+ if (access(a, F_OK) < 0) -+ return -errno; -+ -+ *ret = TAKE_PTR(d); -+ return 0; -+} -+ - int verify_set_unit_path(char **filenames) { - _cleanup_strv_free_ char **ans = NULL; - _cleanup_free_ char *joined = NULL; -@@ -79,21 +127,15 @@ int verify_set_unit_path(char **filenames) { - int r; - - STRV_FOREACH(filename, filenames) { -- _cleanup_free_ char *a = NULL; -- char *t; -+ _cleanup_free_ char *t = NULL; - -- r = path_make_absolute_cwd(*filename, &a); -- if (r < 0) -+ r = find_unit_directory(*filename, &t); -+ if (r == -ENOMEM) - return r; -- -- if (access(a, F_OK) < 0) -- continue; -- -- r = path_extract_directory(a, &t); - if (r < 0) -- return r; -+ continue; - -- r = strv_consume(&ans, t); -+ r = strv_consume(&ans, TAKE_PTR(t)); - if (r < 0) - return r; - } - -From 9d51ab78300364c71a0e1f138e1d2cbc65771b93 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe <watanabe.yu+github@gmail.com> -Date: Fri, 8 Dec 2023 10:41:49 +0900 -Subject: [PATCH 2/2] test: add test cases for issue #30357 - ---- a/test/units/testsuite-65.sh -+++ b/test/units/testsuite-65.sh -@@ -296,6 +296,44 @@ EOF - # Verifies that the --offline= option works with --root= - systemd-analyze security --threshold=90 --offline=true --root=/tmp/img/ testfile.service - -+cat <<EOF >/tmp/foo@.service -+[Service] -+ExecStart=ls -+EOF -+ -+cat <<EOF >/tmp/hoge@test.service -+[Service] -+ExecStart=ls -+EOF -+ -+# issue #30357 -+pushd /tmp -+systemd-analyze verify foo@bar.service -+systemd-analyze verify foo@.service -+systemd-analyze verify hoge@test.service -+(! systemd-analyze verify hoge@nonexist.service) -+(! systemd-analyze verify hoge@.service) -+popd -+pushd / -+systemd-analyze verify tmp/foo@bar.service -+systemd-analyze verify tmp/foo@.service -+systemd-analyze verify tmp/hoge@test.service -+(! systemd-analyze verify tmp/hoge@nonexist.service) -+(! systemd-analyze verify tmp/hoge@.service) -+popd -+pushd /usr -+systemd-analyze verify ../tmp/foo@bar.service -+systemd-analyze verify ../tmp/foo@.service -+systemd-analyze verify ../tmp/hoge@test.service -+(! systemd-analyze verify ../tmp/hoge@nonexist.service) -+(! systemd-analyze verify ../tmp/hoge@.service) -+popd -+systemd-analyze verify /tmp/foo@bar.service -+systemd-analyze verify /tmp/foo@.service -+systemd-analyze verify /tmp/hoge@test.service -+(! systemd-analyze verify /tmp/hoge@nonexist.service) -+(! systemd-analyze verify /tmp/hoge@.service) -+ - # Added an additional "INVALID_ID" id to the .json to verify that nothing breaks when input is malformed - # The PrivateNetwork id description and weight was changed to verify that 'security' is actually reading in - # values from the .json file when required. The default weight for "PrivateNetwork" is 2500, and the new weight - |