summaryrefslogtreecommitdiff
path: root/src/udev/udev-rules.c
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2013-03-31 22:00:59 -0400
committerIan Stakenvicius <axs@gentoo.org>2013-04-02 15:02:48 -0400
commit601c4e8ce69338652b3c9178386cbc05de8bae8d (patch)
tree8c76835f8bc34a1dd81e1f48ec38c02b32e3e766 /src/udev/udev-rules.c
parent20d47ae5b565723c596b5c8afbfd6f7583a9f49e (diff)
udev: update
This updates the daemon codebase to upstream. Authors: Zbigniew Jędrzejewski-Szmek Lennart Poettering Václav Pavlín Kay Sievers Harald Hoyer Rob Clark Zeeshan Ali (Khattak) See http://cgit.freedesktop.org/systemd/systemd/log/src/udev Ian is signing off but has some concerns on a few of the changes that he may fix in future commits. Signed-off-by: Anthony G. Basile <blueness@gentoo.org> Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
Diffstat (limited to 'src/udev/udev-rules.c')
-rw-r--r--src/udev/udev-rules.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 0fcad5d7e9..0561e01567 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1600,21 +1600,6 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
if (!rules->strbuf)
return udev_rules_unref(rules);
- /* Note - need a better way to manage these paths:
- * ie, should have a list of paths we always support, and
- * do not include the #define vars if they are duplicates
- *
- * original - UDEV_RULES_DIR should be /etc/udev/rules.d
- * ..but we have it set to UDEV_LIBEXEC_DIR "/rules.d" so that
- * ..the default rules are installed there instead of in /etc
- *
- * original2 - UDEV_LIBEXEC_DIR used to be forced to /usr/lib/udev
- * ..by default, we have it as /lib/udev (or whatever rootlibdir is)
- * ..therefore we did not include /usr/lib/udev/rules.d.
- *
- * Reworked code; there are duplicate paths here but at least
- * everyting is listed.
- */
rules->dirs = strv_new(UDEV_CONF_DIR "/rules.d",
UDEV_RULES_DIR,
"/run/udev/rules.d",
@@ -1639,7 +1624,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
return udev_rules_unref(rules);
udev_rules_check_timestamp(rules);
- r = conf_files_list_strv(&files, NULL, ".rules", (const char **)rules->dirs);
+ r = conf_files_list_strv(&files, ".rules", NULL, (const char **)rules->dirs);
if (r < 0) {
log_error("failed to enumerate rules files: %s\n", strerror(-r));
return udev_rules_unref(rules);