udevd: at startup create /dev/null, /dev/console, /dev/kmsg

[elogind.git] / udev / lib / libudev-ctrl.c

diff --git a/udev/lib/libudev-ctrl.c b/udev/lib/libudev-ctrl.c
index caf0dc08a363e29bf415954adaf0838b6f526726..80ab0370e237dba6e108b8d0d72e838eba044630 100644 (file)
--- a/udev/lib/libudev-ctrl.c
+++ b/udev/lib/libudev-ctrl.c
@@ -3,18 +3,10 @@
  *
  * Copyright (C) 2008 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
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  */
 
 #include <errno.h>
@@ -30,7 +22,7 @@
 #include "libudev.h"
 #include "libudev-private.h"
 
-/* last known version with this wire protocol */
+/* wire protocol magic must match */
 #define UDEV_CTRL_MAGIC                                0xdead1dea
 
 enum udev_ctrl_msg_type {
@@ -42,6 +34,7 @@ enum udev_ctrl_msg_type {
        UDEV_CTRL_SET_ENV,
        UDEV_CTRL_SET_MAX_CHILDS,
        UDEV_CTRL_SET_MAX_CHILDS_RUNNING,
+       UDEV_CTRL_SETTLE,
 };
 
 struct udev_ctrl_msg_wire {
@@ -58,6 +51,7 @@ struct udev_ctrl_msg {
        int refcount;
        struct udev_ctrl *uctrl;
        struct udev_ctrl_msg_wire ctrl_msg_wire;
+       pid_t pid;
 };
 
 struct udev_ctrl {
@@ -168,38 +162,37 @@ static int ctrl_send(struct udev_ctrl *uctrl, enum udev_ctrl_msg_type type, int
 
 int udev_ctrl_send_set_log_level(struct udev_ctrl *uctrl, int priority)
 {
-       ctrl_send(uctrl, UDEV_CTRL_SET_LOG_LEVEL, priority, NULL);
-       return 0;
+       return ctrl_send(uctrl, UDEV_CTRL_SET_LOG_LEVEL, priority, NULL);
 }
 
 int udev_ctrl_send_stop_exec_queue(struct udev_ctrl *uctrl)
 {
-       ctrl_send(uctrl, UDEV_CTRL_STOP_EXEC_QUEUE, 0, NULL);
-       return 0;
+       return ctrl_send(uctrl, UDEV_CTRL_STOP_EXEC_QUEUE, 0, NULL);
 }
 
 int udev_ctrl_send_start_exec_queue(struct udev_ctrl *uctrl)
 {
-       ctrl_send(uctrl, UDEV_CTRL_START_EXEC_QUEUE, 0, NULL);
-       return 0;
+       return ctrl_send(uctrl, UDEV_CTRL_START_EXEC_QUEUE, 0, NULL);
 }
 
 int udev_ctrl_send_reload_rules(struct udev_ctrl *uctrl)
 {
-       ctrl_send(uctrl, UDEV_CTRL_RELOAD_RULES, 0, NULL);
-       return 0;
+       return ctrl_send(uctrl, UDEV_CTRL_RELOAD_RULES, 0, NULL);
 }
 
 int udev_ctrl_send_set_env(struct udev_ctrl *uctrl, const char *key)
 {
-       ctrl_send(uctrl, UDEV_CTRL_SET_ENV, 0, key);
-       return 0;
+       return ctrl_send(uctrl, UDEV_CTRL_SET_ENV, 0, key);
 }
 
 int udev_ctrl_send_set_max_childs(struct udev_ctrl *uctrl, int count)
 {
-       ctrl_send(uctrl, UDEV_CTRL_SET_MAX_CHILDS, count, NULL);
-       return 0;
+       return ctrl_send(uctrl, UDEV_CTRL_SET_MAX_CHILDS, count, NULL);
+}
+
+int udev_ctrl_send_settle(struct udev_ctrl *uctrl)
+{
+       return ctrl_send(uctrl, UDEV_CTRL_SETTLE, 0, NULL);
 }
 
 struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl *uctrl)
@@ -245,6 +238,8 @@ struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl *uctrl)
                goto err;
        }
 
+       uctrl_msg->pid = cred->pid;
+
        if (uctrl_msg->ctrl_msg_wire.magic != UDEV_CTRL_MAGIC) {
                err(uctrl->udev, "message magic 0x%08x doesn't match, ignore it\n", uctrl_msg->ctrl_msg_wire.magic);
                goto err;
@@ -317,3 +312,10 @@ int udev_ctrl_get_set_max_childs(struct udev_ctrl_msg *ctrl_msg)
                return ctrl_msg->ctrl_msg_wire.intval;
        return -1;
 }
+
+pid_t udev_ctrl_get_settle(struct udev_ctrl_msg *ctrl_msg)
+{
+       if (ctrl_msg->ctrl_msg_wire.type == UDEV_CTRL_SETTLE)
+               return ctrl_msg->pid;
+       return -1;
+}