chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] don't call the hotplug scripts with a test run
[elogind.git]
/
udev_config.c
diff --git
a/udev_config.c
b/udev_config.c
index 51bdc720a73333126b6173001714fef0263711b7..9549471b8bc718455eb34587cac47d9b1a49bf8c 100644
(file)
--- a/
udev_config.c
+++ b/
udev_config.c
@@
-51,6
+51,7
@@
char default_owner_str[OWNER_SIZE];
char default_group_str[GROUP_SIZE];
int udev_log;
int udev_dev_d;
char default_group_str[GROUP_SIZE];
int udev_log;
int udev_dev_d;
+int udev_hotplug_d;
static int string_is_true(char *str)
static int string_is_true(char *str)
@@
-68,7
+69,7
@@
static void init_variables(void)
{
char *env;
{
char *env;
- /* fill up the defaults.
+ /* fill up the defaults.
* If any config values are specified, they will
* override these values. */
strfieldcpy(udev_root, UDEV_ROOT);
* If any config values are specified, they will
* override these values. */
strfieldcpy(udev_root, UDEV_ROOT);
@@
-82,6
+83,11
@@
static void init_variables(void)
env = getenv("UDEV_NO_DEVD");
if (env && string_is_true(env))
udev_dev_d = 0;
env = getenv("UDEV_NO_DEVD");
if (env && string_is_true(env))
udev_dev_d = 0;
+
+ udev_hotplug_d = 1;
+ env = getenv("UDEV_NO_HOTPLUGD");
+ if (env && string_is_true(env))
+ udev_hotplug_d = 0;
}
int parse_get_pair(char **orig_string, char **left, char **right)
}
int parse_get_pair(char **orig_string, char **left, char **right)