udevtest: add udev_rules_apply_format() to RUN keys

Signed-off-by: Kay Sievers <kay.sievers@suse.de>

diff --git a/udev_add.c b/udev_add.c
index 2c66a0ba8d071733a4d69923cca38f573472e97e..6de285831359bf7bac46d69e9b8cc4acc64ec55d 100644 (file)
--- a/udev_add.c
+++ b/udev_add.c
@@ -135,16 +135,14 @@ static int create_node(struct udevice *udev)
                        gid = lookup_group(udev->group);
        }
 
                        gid = lookup_group(udev->group);
        }
 

-       if (!udev->test_run) {
-               info("creating device node '%s'", filename);
+       info("creating device node '%s', major = '%d', minor = '%d', " "mode = '%#o', uid = '%d', gid = '%d'",
+            filename, major(udev->devt), minor(udev->devt), udev->mode, uid, gid);
+
+       if (!udev->test_run)

                if (udev_make_node(udev, filename, udev->devt, udev->mode, uid, gid) != 0)
                        goto error;
                if (udev_make_node(udev, filename, udev->devt, udev->mode, uid, gid) != 0)
                        goto error;

-               setenv("DEVNAME", filename, 1);
-       } else {
-               info("creating device node '%s', major = '%d', minor = '%d', "
-                    "mode = '%#o', uid = '%d', gid = '%d'", filename,
-                    major(udev->devt), minor(udev->devt), udev->mode, uid, gid);
-       }
+
+       setenv("DEVNAME", filename, 1);

 
        /* create all_partitions if requested */
        if (udev->partitions) {
 
        /* create all_partitions if requested */
        if (udev->partitions) {

diff --git a/udevtest.c b/udevtest.c
index 22fd3735c2f96a9b8e208b18434edf188fc2c5f7..d736711a3f7d1b62009482bd0158025ceb37822a 100644 (file)
--- a/udevtest.c
+++ b/udevtest.c
@@ -113,11 +113,16 @@ int main(int argc, char *argv[], char *envp[])
 
        info("looking at device '%s' from subsystem '%s'", udev->dev->devpath, udev->dev->subsystem);
        retval = udev_device_event(&rules, udev);
 
        info("looking at device '%s' from subsystem '%s'", udev->dev->devpath, udev->dev->subsystem);
        retval = udev_device_event(&rules, udev);

-       if (retval == 0) {
+       if (retval == 0 && !udev->ignore_device && udev_run) {

                struct name_entry *name_loop;
 
                struct name_entry *name_loop;
 

-               list_for_each_entry(name_loop, &udev->run_list, node)
-                       info("run: '%s'", name_loop->name);
+               list_for_each_entry(name_loop, &udev->run_list, node) {
+                       char program[PATH_SIZE];
+
+                       strlcpy(program, name_loop->name, sizeof(program));
+                       udev_rules_apply_format(udev, program, sizeof(program));
+                       info("run: '%s'", program);
+               }

        }
 
 exit:
        }
 
 exit: