diff options
| author | Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> | 2015-07-11 03:58:38 +0200 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-09-15 21:30:11 +0200 |
| commit | b6618ffab8ed4981c57f53929276559698541462 (patch) | |
| tree | 92c5f1e44221ad0e21e7adae7f01bd0f2b0be424 | |
| parent | 9cb7be1a3267744ad64b2422e2be4eeb1763d1d2 (diff) | |
| download | unitd-b6618ffab8ed4981c57f53929276559698541462.tar unitd-b6618ffab8ed4981c57f53929276559698541462.zip | |
move /dev/shm to /tmp/shm
Since the /dev filesystem is tiny, /dev/shm needs to live somewhere
else.
Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
| -rw-r--r-- | initd/early.c | 12 | ||||
| -rw-r--r-- | plug/coldplug.c | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/initd/early.c b/initd/early.c index 3f9cf69..89c8104 100644 --- a/initd/early.c +++ b/initd/early.c @@ -66,16 +66,20 @@ early_mounts(void) mount("sysfs", "/sys", "sysfs", MS_NOATIME, 0); mount("none", "/sys/fs/cgroup", "cgroup", 0, 0); mount("tmpfs", "/dev", "tmpfs", MS_NOATIME, "mode=0755,size=512K"); - mkdir("/dev/shm", 01777); + symlink("/tmp/shm", "/dev/shm"); mkdir("/dev/pts", 0755); mount("devpts", "/dev/pts", "devpts", MS_NOATIME, "mode=600"); early_dev(); early_console("/dev/console"); - if (mount_zram_on_tmp()) + if (mount_zram_on_tmp()) { mount("tmpfs", "/tmp", "tmpfs", MS_NOSUID | MS_NODEV | MS_NOATIME, NULL); - else - mkdev("*", 0600); + mkdir("/tmp/shm", 01777); + } else { + mkdir("/tmp/shm", 01777); + mount("tmpfs", "/tmp/shm", "tmpfs", MS_NOSUID | MS_NODEV | MS_NOATIME, + "mode=01777"); + } mkdir("/tmp/run", 0777); mkdir("/tmp/lock", 0777); mkdir("/tmp/state", 0777); diff --git a/plug/coldplug.c b/plug/coldplug.c index d3a607d..bfd3513 100644 --- a/plug/coldplug.c +++ b/plug/coldplug.c @@ -45,7 +45,7 @@ void procd_coldplug(void) umount2("/dev/pts", MNT_DETACH); umount2("/dev/", MNT_DETACH); mount("tmpfs", "/dev", "tmpfs", 0, "mode=0755,size=512K"); - mkdir("/dev/shm", 01777); + symlink("/tmp/shm", "/dev/shm"); mkdir("/dev/pts", 0755); umask(oldumask); mount("devpts", "/dev/pts", "devpts", 0, 0); |