version bump

[elogind.git] / udev / udevd.c

diff --git a/udev/udevd.c b/udev/udevd.c
index 374a4e0bc829b4c6f7786807d700956a559b5af2..2efab5b39d882d65b9413b29afc3f09a818e9174 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -45,6 +45,7 @@
 #include <sys/utsname.h>
 
 #include "udev.h"
+#include "sd-daemon.h"
 
 #define UDEVD_PRIORITY                 -4
 #define UDEV_PRIORITY                  -2
@@ -959,66 +960,6 @@ static int mem_size_mb(void)
        return memsize;
 }
 
-static int init_notify(const char *state)
-{
-       int fd = -1, r;
-       struct msghdr msghdr;
-       struct iovec iovec;
-       union {
-               struct sockaddr sa;
-               struct sockaddr_un un;
-       } sockaddr;
-       const char *e;
-
-       if (!(e = getenv("NOTIFY_SOCKET"))) {
-               r = 0;
-               goto finish;
-       }
-
-       /* Must be an abstract socket, or an absolute path */
-       if ((e[0] != '@' && e[0] != '/') || e[1] == 0) {
-               r = -EINVAL;
-               goto finish;
-       }
-
-       if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) {
-               r = -errno;
-               goto finish;
-       }
-
-       memset(&sockaddr, 0, sizeof(sockaddr));
-       sockaddr.sa.sa_family = AF_UNIX;
-       strncpy(sockaddr.un.sun_path, e, sizeof(sockaddr.un.sun_path));
-
-       if (sockaddr.un.sun_path[0] == '@')
-               sockaddr.un.sun_path[0] = 0;
-
-       memset(&iovec, 0, sizeof(iovec));
-       iovec.iov_base = (char*) state;
-       iovec.iov_len = strlen(state);
-
-       memset(&msghdr, 0, sizeof(msghdr));
-       msghdr.msg_name = &sockaddr;
-       msghdr.msg_namelen = sizeof(sa_family_t) + strlen(e);
-       if (msghdr.msg_namelen > sizeof(struct sockaddr_un))
-               msghdr.msg_namelen = sizeof(struct sockaddr_un);
-       msghdr.msg_iov = &iovec;
-       msghdr.msg_iovlen = 1;
-
-       if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) {
-               r = -errno;
-               goto finish;
-       }
-
-       r = 0;
-
-finish:
-       if (fd >= 0)
-               close(fd);
-
-       return r;
-}
-
 int main(int argc, char *argv[])
 {
        struct udev *udev;
@@ -1271,7 +1212,7 @@ int main(int argc, char *argv[])
                        goto exit;
                }
        } else {
-               init_notify("READY=1");
+               sd_notify(1, "READY=1");
        }
 
        /* set scheduling priority for the main daemon process */
@@ -1285,12 +1226,19 @@ int main(int argc, char *argv[])
                fclose(f);
        }
 
-       /* OOM_DISABLE == -17 */
-       fd = open("/proc/self/oom_adj", O_RDWR);
+       fd = open("/proc/self/oom_score_adj", O_RDWR);
        if (fd < 0) {
-               err(udev, "error disabling OOM: %m\n");
+               /* Fallback to old interface */
+               fd = open("/proc/self/oom_adj", O_RDWR);
+               if (fd < 0) {
+                       err(udev, "error disabling OOM: %m\n");
+               } else {
+                       /* OOM_DISABLE == -17 */
+                       write(fd, "-17", 3);
+                       close(fd);
+               }
        } else {
-               write(fd, "-17", 3);
+               write(fd, "-1000", 5);
                close(fd);
        }