diff options
| -rw-r--r-- | src/shared/log.h | 2 | ||||
| -rw-r--r-- | src/udev/log.c | 20 | ||||
| -rw-r--r-- | src/udev/udev-builtin-uaccess.c | 1 | ||||
| -rw-r--r-- | src/udev/udevadm.c | 1 | ||||
| -rw-r--r-- | src/udev/udevd.c | 1 |
5 files changed, 0 insertions, 25 deletions
diff --git a/src/shared/log.h b/src/shared/log.h index 1bd9dbf27a..fd2285cb61 100644 --- a/src/shared/log.h +++ b/src/shared/log.h @@ -67,8 +67,6 @@ void log_close_journal(void); void log_close_kmsg(void); void log_close_console(void); -void log_parse_environment(void); - int log_meta( int level, const char*file, diff --git a/src/udev/log.c b/src/udev/log.c index 63578683ab..5c07b626c2 100644 --- a/src/udev/log.c +++ b/src/udev/log.c @@ -805,26 +805,6 @@ int log_set_max_level_from_string(const char *e) { return 0; } -void log_parse_environment(void) { - const char *e; - - e = secure_getenv("SYSTEMD_LOG_TARGET"); - if (e && log_set_target_from_string(e) < 0) - log_warning("Failed to parse log target %s. Ignoring.", e); - - e = secure_getenv("SYSTEMD_LOG_LEVEL"); - if (e && log_set_max_level_from_string(e) < 0) - log_warning("Failed to parse log level %s. Ignoring.", e); - - e = secure_getenv("SYSTEMD_LOG_COLOR"); - if (e && log_show_color_from_string(e) < 0) - log_warning("Failed to parse bool %s. Ignoring.", e); - - e = secure_getenv("SYSTEMD_LOG_LOCATION"); - if (e && log_show_location_from_string(e) < 0) - log_warning("Failed to parse bool %s. Ignoring.", e); -} - LogTarget log_get_target(void) { return log_target; } diff --git a/src/udev/udev-builtin-uaccess.c b/src/udev/udev-builtin-uaccess.c index 4d1012fea5..2b9424c882 100644 --- a/src/udev/udev-builtin-uaccess.c +++ b/src/udev/udev-builtin-uaccess.c @@ -43,7 +43,6 @@ static int builtin_uaccess(struct udev_device *dev, int argc, char *argv[], bool uid_t uid; log_set_target(LOG_TARGET_AUTO); - log_parse_environment(); log_open(); umask(0022); diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c index 53419ffa62..b91d3ccb16 100644 --- a/src/udev/udevadm.c +++ b/src/udev/udevadm.c @@ -100,7 +100,6 @@ int main(int argc, char *argv[]) if (udev == NULL) goto out; - log_parse_environment(); log_open(); udev_set_log_fn(udev, udev_main_log); label_init("/dev"); diff --git a/src/udev/udevd.c b/src/udev/udevd.c index adf5bb937c..b9922f51dd 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -1089,7 +1089,6 @@ int main(int argc, char *argv[]) goto exit; log_set_target(LOG_TARGET_AUTO); - log_parse_environment(); log_open(); udev_set_log_fn(udev, udev_main_log); log_debug("version %s\n", VERSION); |