summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am1
-rw-r--r--src/libudev/libudev.c76
-rw-r--r--src/shared/meson.build1
-rw-r--r--src/shared/udev-util.c56
-rw-r--r--src/shared/udev-util.h2
-rw-r--r--src/udev/ata_id/ata_id.c2
-rw-r--r--src/udev/cdrom_id/cdrom_id.c6
-rw-r--r--src/udev/collect/collect.c6
-rw-r--r--src/udev/scsi_id/scsi_id.c2
-rw-r--r--src/udev/udevadm.c11
-rw-r--r--src/udev/udevd.c1
11 files changed, 82 insertions, 82 deletions
diff --git a/Makefile.am b/Makefile.am
index c29660ce07..341492089e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1023,6 +1023,7 @@ libshared_la_SOURCES = \
src/shared/output-mode.c \
src/shared/gpt.h \
src/shared/udev-util.h \
+ src/shared/udev-util.c \
src/shared/linux/auto_dev-ioctl.h \
src/shared/linux-3.13/dm-ioctl.h \
src/shared/initreq.h \
diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c
index d8e13288b0..5f2225f402 100644
--- a/src/libudev/libudev.c
+++ b/src/libudev/libudev.c
@@ -103,82 +103,6 @@ _public_ struct udev *udev_new(void) {
}
udev->refcount = 1;
- f = fopen("/etc/udev/udev.conf", "re");
- if (f != NULL) {
- char line[UTIL_LINE_SIZE];
- unsigned line_nr = 0;
-
- while (fgets(line, sizeof(line), f)) {
- size_t len;
- char *key;
- char *val;
-
- line_nr++;
-
- /* find key */
- key = line;
- while (isspace(key[0]))
- key++;
-
- /* comment or empty line */
- if (key[0] == '#' || key[0] == '\0')
- continue;
-
- /* split key/value */
- val = strchr(key, '=');
- if (val == NULL) {
- log_debug("/etc/udev/udev.conf:%u: missing assignment, skipping line.", line_nr);
- continue;
- }
- val[0] = '\0';
- val++;
-
- /* find value */
- while (isspace(val[0]))
- val++;
-
- /* terminate key */
- len = strlen(key);
- if (len == 0)
- continue;
- while (isspace(key[len-1]))
- len--;
- key[len] = '\0';
-
- /* terminate value */
- len = strlen(val);
- if (len == 0)
- continue;
- while (isspace(val[len-1]))
- len--;
- val[len] = '\0';
-
- if (len == 0)
- continue;
-
- /* unquote */
- if (val[0] == '"' || val[0] == '\'') {
- if (len == 1 || val[len-1] != val[0]) {
- log_debug("/etc/udev/udev.conf:%u: inconsistent quoting, skipping line.", line_nr);
- continue;
- }
- val[len-1] = '\0';
- val++;
- }
-
- if (streq(key, "udev_log")) {
- int prio;
-
- prio = util_log_priority(val);
- if (prio < 0)
- log_debug("/etc/udev/udev.conf:%u: invalid log level '%s', ignoring.", line_nr, val);
- else
- log_set_max_level(prio);
- continue;
- }
- }
- }
-
return udev;
}
diff --git a/src/shared/meson.build b/src/shared/meson.build
index b684e5b543..a9a5b4a6d4 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -89,6 +89,7 @@ shared_sources = '''
tests.c
tests.h
udev-util.h
+ udev-util.c
uid-range.c
uid-range.h
utmp-wtmp.h
diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
new file mode 100644
index 0000000000..f708dcfa14
--- /dev/null
+++ b/src/shared/udev-util.c
@@ -0,0 +1,56 @@
+/***
+ This file is part of systemd.
+
+ Copyright 2017 Zbigniew Jędrzejewski-Szmek
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <string.h>
+
+#include "fileio.h"
+#include "log.h"
+#include "string-util.h"
+#include "udev-util.h"
+
+int udev_parse_config(void) {
+ _cleanup_free_ char *val = NULL;
+ const char *log;
+ size_t n;
+ int r;
+
+ r = parse_env_file("/etc/udev/udev.conf", NEWLINE, "udev_log", &val, NULL);
+ if (r == -ENOENT || !val)
+ return 0;
+ if (r < 0)
+ return r;
+
+ /* unquote */
+ n = strlen(val);
+ if (n >= 2 &&
+ ((val[0] == '"' && val[n-1] == '"') ||
+ (val[0] == '\'' && val[n-1] == '\''))) {
+ val[n - 1] = '\0';
+ log = val + 1;
+ } else
+ log = val;
+
+ /* we set the udev log level here explicitly, this is supposed
+ * to regulate the code in libudev/ and udev/. */
+ r = log_set_max_level_from_string_realm(LOG_REALM_UDEV, log);
+ if (r < 0)
+ log_debug_errno(r, "/etc/udev/udev.conf: failed to set udev log level '%s', ignoring: %m", log);
+
+ return 0;
+}
diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h
index ca0889f8a6..a415be249e 100644
--- a/src/shared/udev-util.h
+++ b/src/shared/udev-util.h
@@ -42,3 +42,5 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_monitor*, udev_monitor_unref);
#define _cleanup_udev_ctrl_msg_unref_ _cleanup_(udev_ctrl_msg_unrefp)
#define _cleanup_udev_monitor_unref_ _cleanup_(udev_monitor_unrefp)
#define _cleanup_udev_list_cleanup_ _cleanup_(udev_list_cleanup)
+
+int udev_parse_config(void);
diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
index 1e414664ce..ad152b9d31 100644
--- a/src/udev/ata_id/ata_id.c
+++ b/src/udev/ata_id/ata_id.c
@@ -427,6 +427,8 @@ int main(int argc, char *argv[])
{}
};
+ log_set_target(LOG_TARGET_AUTO);
+ udev_parse_config();
log_parse_environment();
log_open();
diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c
index 72f284f710..1f906a8525 100644
--- a/src/udev/cdrom_id/cdrom_id.c
+++ b/src/udev/cdrom_id/cdrom_id.c
@@ -38,6 +38,7 @@
#include "libudev-private.h"
#include "random-util.h"
+#include "udev-util.h"
/* device info */
static unsigned int cd_cd_rom;
@@ -843,8 +844,7 @@ static int cd_media_toc(struct udev *udev, int fd)
return 0;
}
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
struct udev *udev;
static const struct option options[] = {
{ "lock-media", no_argument, NULL, 'l' },
@@ -862,6 +862,8 @@ int main(int argc, char *argv[])
int cnt;
int rc = 0;
+ log_set_target(LOG_TARGET_AUTO);
+ udev_parse_config();
log_parse_environment();
log_open();
diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c
index 0e973cd521..0b3c0f969a 100644
--- a/src/udev/collect/collect.c
+++ b/src/udev/collect/collect.c
@@ -29,6 +29,7 @@
#include "macro.h"
#include "stdio-util.h"
#include "string-util.h"
+#include "udev-util.h"
#define BUFSIZE 16
#define UDEV_ALARM_TIMEOUT 180
@@ -361,6 +362,11 @@ int main(int argc, char **argv)
int prune = 0;
char tmpdir[UTIL_PATH_SIZE];
+ log_set_target(LOG_TARGET_AUTO);
+ udev_parse_config();
+ log_parse_environment();
+ log_open();
+
udev = udev_new();
if (udev == NULL) {
ret = EXIT_FAILURE;
diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c
index eba382a82d..3c3d7a6b33 100644
--- a/src/udev/scsi_id/scsi_id.c
+++ b/src/udev/scsi_id/scsi_id.c
@@ -577,6 +577,8 @@ int main(int argc, char **argv)
int newargc;
char **newargv = NULL;
+ log_set_target(LOG_TARGET_AUTO);
+ udev_parse_config();
log_parse_environment();
log_open();
diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c
index 492b2f4c25..befc3bad7b 100644
--- a/src/udev/udevadm.c
+++ b/src/udev/udevadm.c
@@ -23,6 +23,7 @@
#include "selinux-util.h"
#include "string-util.h"
#include "udev.h"
+#include "udev-util.h"
static int adm_version(struct udev *udev, int argc, char *argv[]) {
printf("%s\n", PACKAGE_VERSION);
@@ -87,14 +88,16 @@ int main(int argc, char *argv[]) {
unsigned int i;
int rc = 1, c;
- udev = udev_new();
- if (udev == NULL)
- goto out;
-
+ udev_parse_config();
log_parse_environment();
log_open();
+
mac_selinux_init();
+ udev = udev_new();
+ if (udev == NULL)
+ goto out;
+
while ((c = getopt_long(argc, argv, "+dhV", options, NULL)) >= 0)
switch (c) {
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 56b8c1ec55..3af06c68b2 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1663,6 +1663,7 @@ int main(int argc, char *argv[]) {
int r;
log_set_target(LOG_TARGET_AUTO);
+ udev_parse_config();
log_parse_environment();
log_open();
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-08 20:56:20 +0000