procd: clean up /dev/pts mounts

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

diff --git a/plug/coldplug.c b/plug/coldplug.c
index 123e17d6bdfa4c1447267570c3c60d63f5a1531b..308b79d0c950fc322c36681976034737a9b22ce2 100644 (file)
--- a/plug/coldplug.c
+++ b/plug/coldplug.c
@@ -16,11 +16,14 @@
 #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;
 
@@ -42,23 +45,26 @@ 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", MS_NOSUID, "mode=0755,size=512K");
-       symlink("/tmp/shm", "/dev/shm");
-       mkdir("/dev/pts", 0755);
+       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);
-       mount("devpts", "/dev/pts", "devpts", MS_NOEXEC | MS_NOSUID, 0);
        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;
        }