udevd: always use udevd[] log prefix

diff --git a/udev/udev-event.c b/udev/udev-event.c
index dfd5c37857777a3e4fe77c724e9e35e26bc65765..a8dfff48bf0a3ce646bf1a3419f7a70552ff44b2 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -830,7 +830,7 @@ static void rename_netif_kernel_log(struct ifreq ifr)
                return;
        }
 
-       fprintf(f, "<30>udev[%u]: renamed network interface %s to %s\n",
+       fprintf(f, "<30>udevd[%u]: renamed network interface %s to %s\n",
                getpid(), ifr.ifr_name, ifr.ifr_newname);
        fclose(f);
 }

diff --git a/udev/udevd.c b/udev/udevd.c
index 414f0dbbb5cf2457dc9566782198e882d831adf6..b8513e11fe658c7d2cafe2a43e5088a2c8e8e58c 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -247,8 +247,6 @@ static void worker_new(struct event *event)
                close(fd_signal);
                close(fd_ep);
                close(worker_watch[READ_END]);
-               udev_log_close();
-               udev_log_init("udevd-work");
 
                sigfillset(&mask);
                fd_signal = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC);
@@ -1061,7 +1059,7 @@ static int convert_db(struct udev *udev)
 
        f = fopen("/dev/kmsg", "w");
        if (f != NULL) {
-               fprintf(f, "<30>udev[%u]: converting old udev database\n", getpid());
+               fprintf(f, "<30>udevd[%u]: converting old udev database\n", getpid());
                fclose(f);
        }
 
@@ -1436,7 +1434,7 @@ int main(int argc, char *argv[])
 
        f = fopen("/dev/kmsg", "w");
        if (f != NULL) {
-               fprintf(f, "<30>udev[%u]: starting version " VERSION "\n", getpid());
+               fprintf(f, "<30>udevd[%u]: starting version " VERSION "\n", getpid());
                fclose(f);
        }