2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
-index feb88f3..db55854 100644
+index 39662eb..f21527d 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -85,6 +85,8 @@ static const MountPoint mount_table[] = {
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/src/core/unit.c b/src/core/unit.c
-index 2c09def..77bb9fa 100644
+index 1bda568..11ae93e 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -5003,16 +5003,7 @@ int unit_kill_context(
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/core/main.c b/src/core/main.c
-index 4a37697..2061e5d 100644
+index 9a834a8..2fb0e95 100644
--- a/src/core/main.c
+++ b/src/core/main.c
-@@ -2644,8 +2644,6 @@ int main(int argc, char *argv[]) {
+@@ -2660,8 +2660,6 @@ int main(int argc, char *argv[]) {
kernel_timestamp = DUAL_TIMESTAMP_NULL;
}
+ return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+}
diff --git a/units/meson.build b/units/meson.build
-index aa2ed11..8d7c0f6 100644
+index 275daad..302c600 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -102,6 +102,7 @@ units = [
['systemd-initctl.socket', 'HAVE_SYSV_COMPAT',
'sockets.target.wants/'],
['systemd-journal-catalog-update.service', '',
-@@ -170,6 +171,7 @@ in_units = [
+@@ -171,6 +172,7 @@ in_units = [
['systemd-pstore.service', 'ENABLE_PSTORE'],
['systemd-fsck-root.service', ''],
['systemd-fsck@.service', ''],
+++ /dev/null
-From: Chris Down <chris@chrisdown.name>
-Date: Wed, 26 Aug 2020 18:49:27 +0100
-Subject: path: Improve $PATH search directory case
-
-Previously:
-
-1. last_error wouldn't be updated with errors from is_dir;
-2. We'd always issue a stat(), even for binaries without execute;
-3. We used stat() instead of access(), which is cheaper.
-
-This change avoids all of those, by only checking inside X_OK-positive
-case whether access() works on the path with an extra slash appended.
-Thanks to Lennart for the suggestion.
-
-(cherry picked from commit 33e1a5d8d3f792e1d98377fe439e123231032ec7)
----
- src/basic/path-util.c | 25 ++++++++++++++++++-------
- 1 file changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/src/basic/path-util.c b/src/basic/path-util.c
-index d3b4978..7b0863f7 100644
---- a/src/basic/path-util.c
-+++ b/src/basic/path-util.c
-@@ -637,16 +637,27 @@ int find_binary(const char *name, char **ret) {
- if (!j)
- return -ENOMEM;
-
-- if (is_dir(j, true))
-- continue;
--
- if (access(j, X_OK) >= 0) {
-- /* Found it! */
-+ _cleanup_free_ char *with_dash;
-
-- if (ret)
-- *ret = path_simplify(TAKE_PTR(j), false);
-+ with_dash = strjoin(j, "/");
-+ if (!with_dash)
-+ return -ENOMEM;
-
-- return 0;
-+ /* If this passes, it must be a directory, and so should be skipped. */
-+ if (access(with_dash, X_OK) >= 0)
-+ continue;
-+
-+ /**
-+ * We can't just `continue` inverting this case, since we need to update last_error.
-+ */
-+ if (errno == ENOTDIR) {
-+ /* Found it! */
-+ if (ret)
-+ *ret = path_simplify(TAKE_PTR(j), false);
-+
-+ return 0;
-+ }
- }
-
- /* PATH entries which we don't have access to are ignored, as per tradition. */
networkd-use-socket-activation-when-starting-networkd.patch
test-network-stop-networkd-and-its-socket.patch
seccomp-add-support-for-riscv64.patch
-path-Improve-PATH-search-directory-case.patch
debian/Use-Debian-specific-config-files.patch
debian/Bring-tmpfiles.d-tmp.conf-in-line-with-Debian-defaul.patch
debian/Make-run-lock-tmpfs-an-API-fs.patch
projects / systemd.git / commitdiff