From: Kay Sievers <kay.sievers@vrfy.org>
Date: Wed, 20 Apr 2011 15:39:44 +0000 (+0200)
Subject: udevd: always use udevd[] log prefix
X-Git-Tag: 174~170
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=dff107dc1a12538d351798d43191ae5d07d3c6d6;p=elogind.git

udevd: always use udevd[] log prefix
---

diff --git a/udev/udev-event.c b/udev/udev-event.c
index dfd5c3785..a8dfff48b 100644
--- 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 414f0dbbb..b8513e11f 100644
--- 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);
 	}