Merge commit '9032f119f07ad3b5116b3d4858816d851d4127de'

diff --git a/NEWS b/NEWS
index 52bfa6a9910cd127b407b0ebac629e8f6dd9d974..972b9b0b11d49d30993db3a611c21904b1c29442 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 13a10240d775f6f38a9d61682f2fcf35ec3704f7..7d82d2132e3921505e49c1a92ec894689c73df45 100644 (file)
--- 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 010411c7816a062914c41d82cab04039a4eae8e3..0df6f4ba594dca3c73fd673e46099e6caa72e0ca 100644 (file)
--- 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>