diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2013-07-31 10:46:49 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2013-07-31 10:46:49 -0400 |
| commit | aa417a4d83999f6d7f092161d5c411b8cbce9977 (patch) | |
| tree | a3c0da66e997c079d3803c2c72293bbdc73f2ece /src/udev/udevd.c | |
| parent | ccc30166822f4597ceba3e3b62c09b8f091b9cbb (diff) | |
static-nodes: remove creation of static nodes if HAVE_LIBKMOD
This address upstream commit edeb68c53f1cdc452016b4c8512586a70b1262e3
and https://bugs.gentoo.org/show_bug.cgi?id=477890. If eudev is
configured with --enable-libkmod then we check for kmod >= 14 and
ifdef out the code removed in the upstream commit. Otherwise we
retain it for modutils.
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src/udev/udevd.c')
| -rw-r--r-- | src/udev/udevd.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/udev/udevd.c b/src/udev/udevd.c index a41c196991..26f3d846e1 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -811,6 +811,7 @@ static void handle_signal(struct udev *udev, int signo) } } +#ifndef HAVE_LIBKMOD static void static_dev_create_from_modules(struct udev *udev) { struct utsname kernel; @@ -881,6 +882,7 @@ static void static_dev_create_from_modules(struct udev *udev) fclose(f); } +#endif /* * read the kernel commandline, in case we need to get into debug mode @@ -1033,7 +1035,9 @@ int main(int argc, char *argv[]) mkdir("/run/udev", 0755); dev_setup(NULL); +#ifndef HAVE_LIBKMOD static_dev_create_from_modules(udev); +#endif /* before opening new files, make sure std{in,out,err} fds are in a sane state */ if (daemonize) { |