diff options
| author | Kay Sievers <kay@vrfy.org> | 2012-10-28 04:04:22 +0100 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2012-10-28 04:04:22 +0100 |
| commit | ff944daa019c1101d6464412e6682732ec11143a (patch) | |
| tree | 37623f18e4e7c7f65c5d3d7d2a8be9bef21798d9 /src/udev | |
| parent | a8f454e8a387eaf752a64955dcef8cbbae1b77ed (diff) | |
udev: get rid of SYSCONFDIR
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/keymap/keymap.c | 5 | ||||
| -rw-r--r-- | src/udev/scsi_id/scsi_id.c | 2 | ||||
| -rw-r--r-- | src/udev/udev-rules.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/udev/keymap/keymap.c b/src/udev/keymap/keymap.c index 0db56d26ad..939407fd0b 100644 --- a/src/udev/keymap/keymap.c +++ b/src/udev/keymap/keymap.c @@ -423,12 +423,13 @@ int main(int argc, char **argv) /* Open override file if present, otherwise default file */ char keymap_path[PATH_MAX]; 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"); if (f) { merge_table(fd, f); } 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"); if (f) merge_table(fd, f); diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c index b1e089cb7c..c90b6aa581 100644 --- a/src/udev/scsi_id/scsi_id.c +++ b/src/udev/scsi_id/scsi_id.c @@ -53,7 +53,7 @@ static const char dev_short_options[] = "bgp:"; static int all_good; 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 int sg_version = 4; static int use_stderr; diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index e3bc95f391..6f64bf6055 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -1600,7 +1600,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) if (!rules->strbuf) 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", UDEVLIBEXECDIR "/rules.d", NULL); |