aboutsummaryrefslogtreecommitdiff
Add $EUDEV_RULES_DIRECTORY to the list of rules directories.

The old udev 182 supported $UDEV_CONFIG_FILE, which in turn allowed
the search path to be customized, but eudev no longer has this, hence
this hack.

--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -48,16 +48,11 @@ struct uid_gid {
         };
 };
 
-static const char* const rules_dirs[] = {
+static const char* rules_dirs[] = {
         UDEV_CONF_DIR "/rules.d",
         UDEV_RULES_DIR,
-        UDEV_ROOT_RUN "/udev/rules.d",
         UDEV_LIBEXEC_DIR "/rules.d",
-#ifdef HAVE_SPLIT_USR
-        "/lib/udev/rules.d",
-        "/usr/lib/udev/rules.d",
-#endif
-        "/usr/local/lib/udev/rules.d",
+        NULL,			/* placeholder for $EUDEV_RULES_DIRECTORY */
         NULL};
 
 struct udev_rules {
@@ -1718,6 +1713,9 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) {
 
         udev_rules_check_timestamp(rules);
 
+        /* Allow the user to specify an additional rules directory.  */
+        rules_dirs[3] = getenv("EUDEV_RULES_DIRECTORY");
+
         r = conf_files_list_strv(&files, ".rules", NULL, rules_dirs);
         if (r < 0) {
                 log_error_errno(r, "failed to enumerate rules files: %m");
'>gnu: lxrandr: Update to 0.3.1....Efraim Flashner 2016-07-05gnu: lxappearance: Update to 0.6.2....Efraim Flashner 2016-04-13gnu: pcmanfm, libfm: Update to 1.2.4....Raymond Nicholson 2015-07-22gnu: Add lxrandr....Mathieu Lirzin 2015-07-22gnu: Add lxtask....Mathieu Lirzin 2015-07-22gnu: Add lxterminal....Mathieu Lirzin 2015-07-22gnu: Add pcmanfm....Mathieu Lirzin 2015-07-22gnu: Add libfm....Mathieu Lirzin 2015-07-22gnu: Add menu-cache....Mathieu Lirzin 2015-07-22gnu: Add libfm-extra....Mathieu Lirzin 2015-07-19gnu: lxappearance: Add missing slash....Mathieu Lirzin 2015-07-16gnu: Add lxappearance....Mathieu Lirzin