add a build-time option to disable init related code

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

diff --git a/plug/coldplug.c b/plug/coldplug.c
index 49a2017..5fcb9a3 100644 (file)
--- a/plug/coldplug.c
+++ b/plug/coldplug.c
@@ -19,6 +19,7 @@
 #include <unistd.h>
 
 #include "../procd.h"
+#include "../libc-compat.h"
 
 #include "hotplug.h"
 
@@ -40,13 +41,15 @@ static void udevtrigger_complete(struct uloop_process *proc, int ret)
 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", 01777);
+       mount("tmpfs", "/dev", "tmpfs", MS_NOSUID, "mode=0755,size=512K");
+       ignore(symlink("/tmp/shm", "/dev/shm"));
        mkdir("/dev/pts", 0755);
-       mount("devpts", "/dev/pts", "devpts", 0, 0);
+       umask(oldumask);
+       mount("devpts", "/dev/pts", "devpts", MS_NOEXEC | MS_NOSUID, 0);
        udevtrigger.cb = udevtrigger_complete;
        udevtrigger.pid = fork();
        if (!udevtrigger.pid) {