X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_config.c;h=6bc070d63aeceef99ad7344fc5ac9001179eb1fa;hb=1e50c2dee7401055a0e76c116de939f0893e7429;hp=7d6bb77e5bd7a1b28cbd09c9c5fe92615388b3f0;hpb=18614ab25d4208749a3d85ced33acc6679c60fce;p=elogind.git diff --git a/udev_config.c b/udev_config.c index 7d6bb77e5..6bc070d63 100644 --- a/udev_config.c +++ b/udev_config.c @@ -44,6 +44,7 @@ char udev_db_path[PATH_SIZE]; char udev_config_filename[PATH_SIZE]; char udev_rules_filename[PATH_SIZE]; int udev_log_priority; +int udev_run; int udev_dev_d; int udev_hotplug_d; @@ -171,7 +172,7 @@ static int parse_config_file(void) if (bufline[0] == COMMENT_CHARACTER) continue; - strlcpy(line, bufline, count); + strlcpy(line, bufline, count+1); linepos = line; retval = get_key(&linepos, &variable, &value); @@ -217,10 +218,16 @@ void udev_init_config(void) strcpy(udev_config_filename, UDEV_CONFIG_FILE); strcpy(udev_rules_filename, UDEV_RULES_FILE); udev_log_priority = LOG_ERR; + udev_run = 1; udev_dev_d = 1; udev_hotplug_d = 1; sysfs_get_mnt_path(sysfs_path, sizeof(sysfs_path)); + /* disable RUN key execution */ + env = getenv("UDEV_RUN"); + if (env && !string_is_true(env)) + udev_run = 0; + env = getenv("UDEV_NO_DEVD"); if (env && string_is_true(env)) udev_dev_d = 0;