Attachment 48424 Details for Bug 38686 – Patch

[patch] Patch

tmpfiles-binfmt-unprefixed.patch (text/plain), 1.30 KB, created by Dan Callaghan on 2011-06-25 22:33:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Callaghan

Created: 2011-06-25 22:33:46 UTC

Size: 1.30 KB

patch

obsolete

>From 9cb4bfdfdd05d1c45515407cc3d20907bc2ed8c8 Mon Sep 17 00:00:00 2001
>From: Dan Callaghan <djc@djc.id.au>
>Date: Sat, 25 Jun 2011 18:17:51 +1000
>Subject: [PATCH] also check /lib/tmpfiles.d and /lib/binfmt.d
>
>If systemd is configured with --prefix=/ these files will live in /lib,
>so we need to search in there too.
>---
>
>diff --git a/src/binfmt.c b/src/binfmt.c
>index a815a11..a802bb4 100644
>--- a/src/binfmt.c
>+++ b/src/binfmt.c
>@@ -140,6 +140,7 @@ int main(int argc, char *argv[]) {
>                                     "/etc/binfmt.d",
>                                     "/usr/local/lib/binfmt.d",
>                                     "/usr/lib/binfmt.d",
>+                                    "/lib/binfmt.d",
>                                     NULL);
> 
>                 if (r < 0) {
>diff --git a/src/tmpfiles.c b/src/tmpfiles.c
>index 954c3b7..6133074 100644
>--- a/src/tmpfiles.c
>+++ b/src/tmpfiles.c
>@@ -968,6 +968,7 @@ int main(int argc, char *argv[]) {
>                                     "/etc/tmpfiles.d",
>                                     "/usr/local/lib/tmpfiles.d",
>                                     "/usr/lib/tmpfiles.d",
>+                                    "/lib/tmpfiles.d",
>                                     NULL);
>                 if (r < 0) {
>                         r = EXIT_FAILURE;
>-- 
>1.7.5.4
>

Actions: View | Splinter Review

Attachments on bug 38686: 48424 | 48703

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.