change database file names

[elogind.git] / udev / udev-event.c

diff --git a/udev/udev-event.c b/udev/udev-event.c
index a407975f08b7bb21aa5e8a20be861c9a72bd36ad..3a6c71abe904efeeacb40f3a464dce4edd4e75aa 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2009 Kay Sievers <kay.sievers@vrfy.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -531,10 +531,12 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
        struct udev_device *dev = event->dev;
        int err = 0;
 
-       if (udev_device_get_devpath_old(dev) != NULL) {
-               if (udev_device_rename_db(dev, udev_device_get_devpath(dev)) == 0)
-                       info(event->udev, "moved database from '%s' to '%s'\n",
-                            udev_device_get_devpath_old(dev), udev_device_get_devpath(dev));
+       if (udev_device_get_sysname_old(dev) != NULL &&
+           strcmp(udev_device_get_sysname_old(dev), udev_device_get_sysname(dev)) != 0) {
+               udev_device_rename_db(dev);
+               info(event->udev, "moved database from '%s:%s' to '%s:%s'\n",
+                    udev_device_get_subsystem(dev), udev_device_get_sysname_old(dev),
+                    udev_device_get_subsystem(dev), udev_device_get_sysname(dev));
        }
 
        /* add device node */
@@ -571,7 +573,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
                }
 
                if (event->name != NULL && event->name[0] == '\0') {
-                       info(event->udev, "device node creation supressed\n");
+                       info(event->udev, "device node creation suppressed\n");
                        delete_kdevnode = 1;
                        goto exit_add;
                }
@@ -741,7 +743,7 @@ int udev_event_execute_run(struct udev_event *event)
                        udev_event_apply_format(event, cmd, program, sizeof(program));
                        envp = udev_device_get_properties_envp(event->dev);
                        if (util_run_program(event->udev, program, envp, NULL, 0, NULL) != 0) {
-                               if (!udev_list_entry_get_flag(list_entry))
+                               if (udev_list_entry_get_flag(list_entry))
                                        err = -1;
                        }
                }