diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2007-08-29 14:11:37 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2007-08-29 14:11:37 +0200 |
| commit | a75689bad504e35e346b84960b2b604532b1d6b5 (patch) | |
| tree | 6ab67b02456a64a86963881a06d450762b5a7378 /udev_rules.c | |
| parent | 1113044be205f9d78642744ffaa01329a77bee79 (diff) | |
do not delete the device node with ignore_remove, but handle the event
Diffstat (limited to 'udev_rules.c')
| -rw-r--r-- | udev_rules.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/udev_rules.c b/udev_rules.c index 01fb2117b2..364d1b7adc 100644 --- a/udev_rules.c +++ b/udev_rules.c @@ -1472,9 +1472,14 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev) break; dbg("process rule"); - if (rule->name.operation != KEY_OP_UNSET || rule->symlink.operation != KEY_OP_UNSET || - rule->mode_operation != KEY_OP_UNSET || rule->owner.operation != KEY_OP_UNSET || - rule->group.operation != KEY_OP_UNSET) { + if (rule->name.operation == KEY_OP_ASSIGN || + rule->name.operation == KEY_OP_ASSIGN_FINAL || + rule->name.operation == KEY_OP_ADD || + rule->symlink.operation == KEY_OP_ASSIGN || + rule->symlink.operation == KEY_OP_ASSIGN_FINAL || + rule->symlink.operation == KEY_OP_ADD || + rule->mode_operation != KEY_OP_UNSET || + rule->owner.operation != KEY_OP_UNSET || rule->group.operation != KEY_OP_UNSET) { dbg("skip rule that names a device"); continue; } @@ -1485,6 +1490,10 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev) udev->ignore_device = 1; return 0; } + if (rule->ignore_remove) { + udev->ignore_remove = 1; + dbg("remove event should be ignored"); + } if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) { struct name_entry *entry; |