linux-hotplug.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: William Hubbs <w.d.hubbs@gmail.com>
To: linux-hotplug@vger.kernel.org
Subject: [PATCH] udev: sync udev rules directories with systemd units directories
Date: Fri, 13 Jul 2012 21:21:43 +0000	[thread overview]
Message-ID: <1342214503-7931-1-git-send-email-w.d.hubbs@gmail.com> (raw)

From: Michał Górny <mgorny@gentoo.org>

This adds /usr/lib, /usr/local/lib, and /lib (if split-usr is enabled)
to the directories where udev searches for rules.d. This brings udev in
line with how systemd searches for units and it is also needed if
split-usr is enabled because other software packages currently install
rules in /lib/udev/rules.d.
---
 src/udev/udev-rules.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index b5b54dd..784d25e 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1759,7 +1759,12 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
 
         rules->dirs = strv_new(TEST_PREFIX SYSCONFDIR "/udev/rules.d",
                                TEST_PREFIX "/run/udev/rules.d",
+                               TEST_PREFIX "/usr/local/lib/udev/rules.d",
                                TEST_PREFIX UDEVLIBEXECDIR "/rules.d",
+                               TEST_PREFIX "/usr/lib/udev/rules.d",
+#ifdef HAVE_SPLIT_USR
+                               TEST_PREFIX "/lib/udev/rules.d",
+#endif
                                NULL);
         if (!rules->dirs) {
                 log_error("failed to build config directory array");
-- 
1.7.8.6


             reply	other threads:[~2012-07-13 21:21 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-13 21:21 William Hubbs [this message]
2012-07-13 21:38 ` [PATCH] udev: sync udev rules directories with systemd units directories Kay Sievers
2012-07-13 22:48 ` William Hubbs
2012-07-13 23:06 ` Kay Sievers
2012-07-14  0:33 ` William Hubbs
2012-07-14  3:46 ` Marco d'Itri
2012-07-14  5:42 ` William Hubbs
2012-07-14  5:52 ` Marco d'Itri
2012-07-14  7:21 ` William Hubbs
2012-07-15 17:03 ` Martin Pitt
2012-07-15 17:14 ` Marco d'Itri
2012-07-15 17:45 ` Martin Pitt
2012-07-15 23:09 ` William Hubbs
2012-07-16  0:02 ` Kay Sievers
2012-07-16  0:06 ` Marco d'Itri
2012-07-16  0:26 ` Kay Sievers
2012-07-17  0:57 ` William Hubbs
2012-07-17  1:14 ` William Hubbs
2012-07-17  7:03 ` Lucas De Marchi
2012-07-17 11:46 ` Tom Gundersen
2012-07-17 23:44 ` William Hubbs
2012-07-17 23:50 ` Greg KH
2012-07-18  6:02 ` William Hubbs

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1342214503-7931-1-git-send-email-w.d.hubbs@gmail.com \
    --to=w.d.hubbs@gmail.com \
    --cc=linux-hotplug@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).