mirror of https://gitee.com/openkylin/linux.git
[PATCH] keep pnpbios usermod_helper away from hotplug_path[]
These days we use udev to manage all kernel events. /proc/sys/kernel/hotplug will usually be disabled by an init-script. pnpnbios is not integrated with the driver core and should stay away from the now disabled /sbin/hotplug. Set the helper to /sbin/phpbios, even when there is probably no current user of this faciliy. If it's needed, it should definitely get proper driver core integration instead of forking binaries from the kernel. Signed-off-by: Kay Sievers <kay.sievers@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
88026842b0
commit
0343821177
|
@ -56,7 +56,6 @@
|
||||||
#include <linux/mm.h>
|
#include <linux/mm.h>
|
||||||
#include <linux/smp.h>
|
#include <linux/smp.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/kobject_uevent.h>
|
|
||||||
#include <linux/completion.h>
|
#include <linux/completion.h>
|
||||||
#include <linux/spinlock.h>
|
#include <linux/spinlock.h>
|
||||||
#include <linux/dmi.h>
|
#include <linux/dmi.h>
|
||||||
|
@ -106,8 +105,6 @@ static int pnp_dock_event(int dock, struct pnp_docking_station_info *info)
|
||||||
char *argv [3], **envp, *buf, *scratch;
|
char *argv [3], **envp, *buf, *scratch;
|
||||||
int i = 0, value;
|
int i = 0, value;
|
||||||
|
|
||||||
if (!hotplug_path [0])
|
|
||||||
return -ENOENT;
|
|
||||||
if (!current->fs->root) {
|
if (!current->fs->root) {
|
||||||
return -EAGAIN;
|
return -EAGAIN;
|
||||||
}
|
}
|
||||||
|
@ -119,8 +116,9 @@ static int pnp_dock_event(int dock, struct pnp_docking_station_info *info)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* only one standardized param to hotplug command: type */
|
/* FIXME: if there are actual users of this, it should be integrated into
|
||||||
argv [0] = hotplug_path;
|
* the driver core and use the usual infrastructure like sysfs and uevents */
|
||||||
|
argv [0] = "/sbin/pnpbios";
|
||||||
argv [1] = "dock";
|
argv [1] = "dock";
|
||||||
argv [2] = NULL;
|
argv [2] = NULL;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue