udev: get rid of SYSCONFDIR
This commit is contained in:
parent
a8f454e8a3
commit
ff944daa01
|
@ -117,7 +117,6 @@ udevlibexec_PROGRAMS =
|
||||||
|
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-include $(top_builddir)/config.h \
|
-include $(top_builddir)/config.h \
|
||||||
-DSYSCONFDIR=\""$(sysconfdir)"\" \
|
|
||||||
-DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
|
-DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
|
||||||
-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
|
-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
|
||||||
-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
|
-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
|
||||||
|
|
|
@ -120,7 +120,7 @@ _public_ struct udev *udev_new(void)
|
||||||
udev->log_priority = LOG_ERR;
|
udev->log_priority = LOG_ERR;
|
||||||
udev_list_init(udev, &udev->properties_list, true);
|
udev_list_init(udev, &udev->properties_list, true);
|
||||||
|
|
||||||
f = fopen(SYSCONFDIR "/udev/udev.conf", "re");
|
f = fopen("/etc/udev/udev.conf", "re");
|
||||||
if (f != NULL) {
|
if (f != NULL) {
|
||||||
char line[UTIL_LINE_SIZE];
|
char line[UTIL_LINE_SIZE];
|
||||||
int line_nr = 0;
|
int line_nr = 0;
|
||||||
|
@ -144,7 +144,7 @@ _public_ struct udev *udev_new(void)
|
||||||
/* split key/value */
|
/* split key/value */
|
||||||
val = strchr(key, '=');
|
val = strchr(key, '=');
|
||||||
if (val == NULL) {
|
if (val == NULL) {
|
||||||
udev_err(udev, "missing <key>=<value> in " SYSCONFDIR "/udev/udev.conf[%i]; skip line\n", line_nr);
|
udev_err(udev, "missing <key>=<value> in /etc/udev/udev.conf[%i]; skip line\n", line_nr);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
val[0] = '\0';
|
val[0] = '\0';
|
||||||
|
@ -176,7 +176,7 @@ _public_ struct udev *udev_new(void)
|
||||||
/* unquote */
|
/* unquote */
|
||||||
if (val[0] == '"' || val[0] == '\'') {
|
if (val[0] == '"' || val[0] == '\'') {
|
||||||
if (val[len-1] != val[0]) {
|
if (val[len-1] != val[0]) {
|
||||||
udev_err(udev, "inconsistent quoting in " SYSCONFDIR "/udev/udev.conf[%i]; skip line\n", line_nr);
|
udev_err(udev, "inconsistent quoting in /etc/udev/udev.conf[%i]; skip line\n", line_nr);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
val[len-1] = '\0';
|
val[len-1] = '\0';
|
||||||
|
|
|
@ -423,12 +423,13 @@ int main(int argc, char **argv)
|
||||||
/* Open override file if present, otherwise default file */
|
/* Open override file if present, otherwise default file */
|
||||||
char keymap_path[PATH_MAX];
|
char keymap_path[PATH_MAX];
|
||||||
FILE *f;
|
FILE *f;
|
||||||
snprintf(keymap_path, sizeof(keymap_path), "%s%s", SYSCONFDIR "/udev/keymaps/", filearg);
|
|
||||||
|
snprintf(keymap_path, sizeof(keymap_path), "/etc/udev/keymaps/%s", filearg);
|
||||||
f = fopen(keymap_path, "re");
|
f = fopen(keymap_path, "re");
|
||||||
if (f) {
|
if (f) {
|
||||||
merge_table(fd, f);
|
merge_table(fd, f);
|
||||||
} else {
|
} else {
|
||||||
snprintf(keymap_path, sizeof(keymap_path), "%s%s", UDEVLIBEXECDIR "/keymaps/", filearg);
|
snprintf(keymap_path, sizeof(keymap_path), UDEVLIBEXECDIR "/keymaps/%s", filearg);
|
||||||
f = fopen(keymap_path, "re");
|
f = fopen(keymap_path, "re");
|
||||||
if (f)
|
if (f)
|
||||||
merge_table(fd, f);
|
merge_table(fd, f);
|
||||||
|
|
|
@ -53,7 +53,7 @@ static const char dev_short_options[] = "bgp:";
|
||||||
|
|
||||||
static int all_good;
|
static int all_good;
|
||||||
static int dev_specified;
|
static int dev_specified;
|
||||||
static char config_file[MAX_PATH_LEN] = SYSCONFDIR "/scsi_id.config";
|
static char config_file[MAX_PATH_LEN] = "/etc/scsi_id.config";
|
||||||
static enum page_code default_page_code;
|
static enum page_code default_page_code;
|
||||||
static int sg_version = 4;
|
static int sg_version = 4;
|
||||||
static int use_stderr;
|
static int use_stderr;
|
||||||
|
|
|
@ -1600,7 +1600,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
|
||||||
if (!rules->strbuf)
|
if (!rules->strbuf)
|
||||||
return udev_rules_unref(rules);
|
return udev_rules_unref(rules);
|
||||||
|
|
||||||
rules->dirs = strv_new(SYSCONFDIR "/udev/rules.d",
|
rules->dirs = strv_new("/etc/udev/rules.d",
|
||||||
"/run/udev/rules.d",
|
"/run/udev/rules.d",
|
||||||
UDEVLIBEXECDIR "/rules.d",
|
UDEVLIBEXECDIR "/rules.d",
|
||||||
NULL);
|
NULL);
|
||||||
|
|
Loading…
Reference in New Issue