udebug: add support for logging via udebug

[project/procd.git] / plug / coldplug.c

diff --git a/plug/coldplug.c b/plug/coldplug.c
index 466b759ecbcc6babce36797a8bfaf01f3ce01a20..f84acef97e29aef03751c78f951158281b12164e 100644 (file)
--- a/plug/coldplug.c
+++ b/plug/coldplug.c
@@ -16,51 +16,59 @@
 #include <sys/types.h>
 #include <sys/mount.h>
 
+#include <stdlib.h>
 #include <unistd.h>
 
 #include "../procd.h"
+#include "../libc-compat.h"
 
 #include "hotplug.h"
+#include "../container.h"
 
 static struct uloop_process udevtrigger;
 
 static void coldplug_complete(struct uloop_timeout *t)
 {
-       DEBUG(4, "Coldplug complete\n");
+       P_DEBUG(4, "Coldplug complete\n");
        hotplug_last_event(NULL);
        procd_state_next();
 }
 
 static void udevtrigger_complete(struct uloop_process *proc, int ret)
 {
-       DEBUG(4, "Finished udevtrigger\n");
+       P_DEBUG(4, "Finished udevtrigger\n");
        hotplug_last_event(coldplug_complete);
 }
 
 void procd_coldplug(void)
 {
        char *argv[] = { "udevtrigger", NULL };
+       unsigned int oldumask = umask(0);
 
-       umount2("/dev/pts", MNT_DETACH);
-       umount2("/dev/", MNT_DETACH);
-       mount("tmpfs", "/dev", "tmpfs", 0, "mode=0755,size=512K");
-       mkdir("/dev/shm", 0755);
-       mkdir("/dev/pts", 0755);
-       mount("devpts", "/dev/pts", "devpts", 0, 0);
+       if (!is_container()) {
+               umount2("/dev/pts", MNT_DETACH);
+               umount2("/dev/", MNT_DETACH);
+               mount("tmpfs", "/dev", "tmpfs", MS_NOATIME | MS_NOEXEC | MS_NOSUID, "mode=0755,size=512K");
+               mkdir("/dev/pts", 0755);
+               mount("devpts", "/dev/pts", "devpts", MS_NOATIME | MS_NOEXEC | MS_NOSUID, 0);
+       }
+
+       ignore(symlink("/tmp/shm", "/dev/shm"));
+       umask(oldumask);
        udevtrigger.cb = udevtrigger_complete;
        udevtrigger.pid = fork();
        if (!udevtrigger.pid) {
                execvp(argv[0], argv);
-               ERROR("Failed to start coldplug\n");
-               exit(-1);
+               ERROR("Failed to start coldplug: %m\n");
+               exit(EXIT_FAILURE);
        }
 
        if (udevtrigger.pid <= 0) {
-               ERROR("Failed to start new coldplug instance\n");
+               ERROR("Failed to start new coldplug instance: %m\n");
                return;
        }
 
        uloop_process_add(&udevtrigger);
 
-       DEBUG(4, "Launched coldplug instance, pid=%d\n", (int) udevtrigger.pid);
+       P_DEBUG(4, "Launched coldplug instance, pid=%d\n", (int) udevtrigger.pid);
 }