summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2013-04-04 20:10:56 -0400
committerIan Stakenvicius <axs@gentoo.org>2013-04-04 20:49:21 -0400
commitb8c77fcd0774e0c1ecf0451c4faaa4de08359ee6 (patch)
tree9e35e01e6527e96cd047a770e3762f209d945d90
parent1d70a98af49337f52ba5f8f0f855cad09959fc47 (diff)
src/udev/udev-rules.c: fix bug introduced in our 601c4e8
This error was introduced in our commit 601c4e8ce69338652b3c9178386cbc05de8bae8d when importing from upstream. The revert line works only in the context of all of upstream's commit 7850b3b83791ba0e2377ba40383c5abc258b839d Signed-off-by: Anthony G. Basile <blueness@gentoo.org> Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
-rw-r--r--src/udev/udev-rules.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 0561e01567..5e56c2f7a0 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1624,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, ".rules", NULL, (const char **)rules->dirs);
+ r = conf_files_list_strv(&files, NULL, ".rules", (const char **)rules->dirs);
if (r < 0) {
log_error("failed to enumerate rules files: %s\n", strerror(-r));
return udev_rules_unref(rules);