diff options
| author | Ian Stakenvicius <axs@gentoo.org> | 2013-07-31 12:52:39 -0400 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2013-07-31 13:07:33 -0400 |
| commit | 9a769172c3af6e9c51b7c55cb9df9fddcc13dbc6 (patch) | |
| tree | 7ed816e3cf3b2cd8160e9e14723070f13d0f635e /src/udev/udevd.c | |
| parent | aa417a4d83999f6d7f092161d5c411b8cbce9977 (diff) | |
Revert "static-nodes: remove creation of static nodes if HAVE_LIBKMOD"
This reverts commit aa417a4d83999f6d7f092161d5c411b8cbce9977.
Preface: The kmod+tmpfiles static dev-node creation requires two commands to
be executed at runtime -- it is not something that will automatically occur
without a system's setup being explicitly designed or changed so that these
commands are executed.
Preface2: In order for the kmod+tmpfiles static dev-node creation to work
properly, that -must- be executed at startup before {systemd-,}udevd starts.
The reason for this is because udevd will only set permissions on those files
at startup, and so if udevd starts beforehand then these nodes will exist with
permissions that are (probably) too restrictive.
The function in udevd which creates static-nodes is non-fatal and only updates
mtime on the devnodes if they already exist. As such, if a system is configured
to execute kmod+tmpfiles to create static-nodes, because that must occur first,
eudev's udevd will not conflict. Also, if a system does not execute kmod+tmpfiles,
then eudev will still create the static devnodes, even if kmod-14 or higher is
installed.
There *may* be a conflict if kmod+tmpfiles is executed after udevd starts, but
as per "preface2" this is not a supported configuration.
Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
Diffstat (limited to 'src/udev/udevd.c')
| -rw-r--r-- | src/udev/udevd.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 26f3d846e1..a41c196991 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -811,7 +811,6 @@ 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; @@ -882,7 +881,6 @@ 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 @@ -1035,9 +1033,7 @@ 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) { |