mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-10-26 17:25:34 +03:00
[PATCH] don't call the hotplug scripts with a test run
This commit is contained in:
parent
97adaace4f
commit
16ac31aaee
@ -1153,6 +1153,7 @@ $ENV{UDEV_TEST} = "yes";
|
||||
$ENV{SYSFS_PATH} = $sysfs;
|
||||
$ENV{UDEV_CONFIG_FILE} = $main_conf;
|
||||
$ENV{UDEV_NO_DEVD} = "yes";
|
||||
$ENV{UDEV_NO_HOTPLUGD} = "yes";
|
||||
|
||||
|
||||
sub udev {
|
||||
|
2
udev.c
2
udev.c
@ -223,7 +223,7 @@ int main(int argc, char *argv[], char *envp[])
|
||||
}
|
||||
|
||||
hotplug:
|
||||
if (manage_hotplug_event())
|
||||
if (udev_hotplug_d && manage_hotplug_event())
|
||||
udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
|
||||
|
||||
exit:
|
||||
|
1
udev.h
1
udev.h
@ -91,5 +91,6 @@ extern char default_owner_str[OWNER_SIZE];
|
||||
extern char default_group_str[GROUP_SIZE];
|
||||
extern int udev_log;
|
||||
extern int udev_dev_d;
|
||||
extern int udev_hotplug_d;
|
||||
|
||||
#endif
|
||||
|
@ -51,6 +51,7 @@ char default_owner_str[OWNER_SIZE];
|
||||
char default_group_str[GROUP_SIZE];
|
||||
int udev_log;
|
||||
int udev_dev_d;
|
||||
int udev_hotplug_d;
|
||||
|
||||
|
||||
static int string_is_true(char *str)
|
||||
@ -68,7 +69,7 @@ static void init_variables(void)
|
||||
{
|
||||
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);
|
||||
@ -82,6 +83,11 @@ static void init_variables(void)
|
||||
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)
|
||||
|
Loading…
Reference in New Issue
Block a user