diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-01-21 14:43:22 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2009-01-21 14:43:22 +0100 |
| commit | 4b0faa2aa0e7ca87fc0fdb637c69e978a7241e1c (patch) | |
| tree | e57eaa9179c984e0160abcc6242fb7cde8f38cb0 | |
| parent | 2c7b88c4a55426087955a12aad33c1935e639876 (diff) | |
| parent | 9032f119f07ad3b5116b3d4858816d851d4127de (diff) | |
Merge commit '9032f119f07ad3b5116b3d4858816d851d4127de'
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | udev/udevd.c | 8 | ||||
| -rw-r--r-- | udev/udevd.xml | 5 |
3 files changed, 10 insertions, 6 deletions
@@ -6,7 +6,8 @@ The udevadm test command has no longer a --force option, nodes and symlinks are always updated with a test run now. The udevd daemon can be started with --resolve-names=never to avoid all user -and group lookups (e.g. in cut-down systems). +and group lookups (e.g. in cut-down systems) or --resolve-names=late to +lookup user and groups every time events are handled. udev 136 ======== diff --git a/udev/udevd.c b/udev/udevd.c index 13a10240d7..7d82d2132e 100644 --- a/udev/udevd.c +++ b/udev/udevd.c @@ -688,16 +688,18 @@ int main(int argc, char *argv[]) case 'N': if (strcmp (optarg, "early") == 0) { resolve_names = 1; + } else if (strcmp (optarg, "late") == 0) { + resolve_names = 0; } else if (strcmp (optarg, "never") == 0) { resolve_names = -1; } else { - fprintf(stderr, "resolve-names must be early or never\n"); - err(udev, "resolve-names must be early or never\n"); + fprintf(stderr, "resolve-names must be early, late or never\n"); + err(udev, "resolve-names must be early, late or never\n"); goto exit; } break; case 'h': - printf("Usage: udevd [--help] [--daemon] [--debug-trace] [--debug] [--resolve-names=early|never] [--version]\n"); + printf("Usage: udevd [--help] [--daemon] [--debug-trace] [--debug] [--resolve-names=early|late|never] [--version]\n"); goto exit; case 'V': printf("%s\n", VERSION); diff --git a/udev/udevd.xml b/udev/udevd.xml index 010411c781..0df6f4ba59 100644 --- a/udev/udevd.xml +++ b/udev/udevd.xml @@ -29,7 +29,7 @@ <arg><option>--debug-trace</option></arg> <arg><option>--debug</option></arg> <arg><option>--version</option></arg> - <arg><option>--resolve-names=early|never</option></arg> + <arg><option>--resolve-names=early|late|never</option></arg> <arg><option>--help</option></arg> </cmdsynopsis> </refsynopsisdiv> @@ -70,7 +70,8 @@ <listitem> <para>Specify when udevd should resolve names of users and groups. When set to <option>early</option> (the default) names will be - resolved when the rules are parsed. + resolved when the rules are parsed. When set to + <option>late</option> names will be resolved for every event. When set to <option>never</option> names will never be resolved and all devices will be owned by root.</para> </listitem> |