udevd: use facility == LOG_DAEMON when writing to /dev/kmsg

Syslog wants to distinguish the sorce of messages. We should
indicate that this is a userspace message (LOG_DAEMON) and not
a kernel message (LOG_KERNEL).

diff --git a/TODO b/TODO
index 029b70e1b7124be62d6ad94be1b157022565363d..f40c8cfddd637b7ef0a8c17a8b4f97f70b7bf244 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,5 +1,5 @@
+  - bind control socket in systemd

 
 

-  o get rid of "scan all devices to find myself" libusb interface
-      if it can not be fixed, drop libusb entirely and add a simple
-      wrapper around the Linux usb ioctls we need
-  o remove deprecated BUS=, SYSFS{}=, ID= keys
+  - kill --failed
+
+  - remove deprecated BUS=, SYSFS{}=, ID= keys

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 137ba36776043ee12dbd31da6eda191016d86aed..63a8b3aa830d9db833614a7ffa678ec21aa5de18 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -454,7 +454,7 @@ static void rename_netif_kernel_log(struct ifreq ifr)
                return;
        }
 
                return;
        }
 

-       fprintf(f, "<6>udev[%u]: renamed network interface %s to %s\n",
+       fprintf(f, "<30>udev[%u]: renamed network interface %s to %s\n",

                getpid(), ifr.ifr_name, ifr.ifr_newname);
        fclose(f);
 }
                getpid(), ifr.ifr_name, ifr.ifr_newname);
        fclose(f);
 }

diff --git a/udev/udevd.c b/udev/udevd.c
index fe0e3c39295724776a71f248eaf13ef4df5f3fab..2a42dfa765ae6979723f5507cf057a7af3510950 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -994,7 +994,7 @@ static int convert_db(struct udev *udev)
 
        f = fopen("/dev/kmsg", "w");
        if (f != NULL) {
 
        f = fopen("/dev/kmsg", "w");
        if (f != NULL) {

-               fprintf(f, "<6>udev[%u]: converting old udev database\n", getpid());
+               fprintf(f, "<30>udev[%u]: converting old udev database\n", getpid());

                fclose(f);
        }
 
                fclose(f);
        }
 


@@ -1333,7 +1333,7 @@ int main(int argc, char *argv[])
 
        f = fopen("/dev/kmsg", "w");
        if (f != NULL) {
 
        f = fopen("/dev/kmsg", "w");
        if (f != NULL) {

-               fprintf(f, "<6>udev[%u]: starting version " VERSION "\n", getpid());
+               fprintf(f, "<30>udev[%u]: starting version " VERSION "\n", getpid());

                fclose(f);
        }
 
                fclose(f);
        }