diff options
| author | Kay Sievers <kay.sievers@suse.de> | 2006-01-25 02:18:13 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@suse.de> | 2006-01-25 02:18:13 +0100 |
| commit | ad27f5b3962d4cb1e4fcc25d3d0c7d0c81abc82a (patch) | |
| tree | 7f113c73f81aedd8b1650de328bb6d61fd36065e | |
| parent | a9bd2ed84a7b0871c281adc8226f12ae46da4de0 (diff) | |
udevtest: add udev_rules_apply_format() to RUN keys
Signed-off-by: Kay Sievers <kay.sievers@suse.de>
| -rw-r--r-- | udev_add.c | 14 | ||||
| -rw-r--r-- | udevtest.c | 11 |
2 files changed, 14 insertions, 11 deletions
diff --git a/udev_add.c b/udev_add.c index 2c66a0ba8d..6de2858313 100644 --- a/udev_add.c +++ b/udev_add.c @@ -135,16 +135,14 @@ static int create_node(struct udevice *udev) 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; - 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) { diff --git a/udevtest.c b/udevtest.c index 22fd3735c2..d736711a3f 100644 --- 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); - if (retval == 0) { + if (retval == 0 && !udev->ignore_device && udev_run) { 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: |