summaryrefslogtreecommitdiff
path: root/patches/procd-openwrt-18.06/0001-lxd-no-mounts.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/procd-openwrt-18.06/0001-lxd-no-mounts.patch')
-rw-r--r--patches/procd-openwrt-18.06/0001-lxd-no-mounts.patch83
1 files changed, 83 insertions, 0 deletions
diff --git a/patches/procd-openwrt-18.06/0001-lxd-no-mounts.patch b/patches/procd-openwrt-18.06/0001-lxd-no-mounts.patch
new file mode 100644
index 0000000..6bbd8f1
--- /dev/null
+++ b/patches/procd-openwrt-18.06/0001-lxd-no-mounts.patch
@@ -0,0 +1,83 @@
+From 991241149ad50b0ef5e221fe34d993ad67cb4174 Mon Sep 17 00:00:00 2001
+From: Mikael Magnusson <mikma@users.sourceforge.net>
+Date: Fri, 24 Aug 2018 13:55:42 +0000
+Subject: [PATCH 1/3] lxd: no mounts
+
+---
+ initd/early.c | 16 ----------------
+ initd/zram.c | 6 ------
+ plug/coldplug.c | 5 -----
+ 3 files changed, 27 deletions(-)
+
+diff --git a/initd/early.c b/initd/early.c
+index 00fd946..dac07b9 100644
+--- a/initd/early.c
++++ b/initd/early.c
+@@ -26,13 +26,6 @@
+ #include "init.h"
+ #include "../libc-compat.h"
+
+-static void
+-early_dev(void)
+-{
+- mkdev("*", 0600);
+- mknod("/dev/null", 0666, makedev(1, 3));
+-}
+-
+ static void
+ early_console(const char *dev)
+ {
+@@ -56,15 +49,6 @@ early_mounts(void)
+ {
+ unsigned int oldumask = umask(0);
+
+- mount("proc", "/proc", "proc", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
+- mount("sysfs", "/sys", "sysfs", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
+- mount("cgroup", "/sys/fs/cgroup", "cgroup", MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
+- mount("tmpfs", "/dev", "tmpfs", MS_NOATIME | MS_NOSUID, "mode=0755,size=512K");
+- ignore(symlink("/tmp/shm", "/dev/shm"));
+- mkdir("/dev/pts", 0755);
+- mount("devpts", "/dev/pts", "devpts", MS_NOATIME | MS_NOEXEC | MS_NOSUID, "mode=600");
+- early_dev();
+-
+ early_console("/dev/console");
+ if (mount_zram_on_tmp()) {
+ mount("tmpfs", "/tmp", "tmpfs", MS_NOSUID | MS_NODEV | MS_NOATIME, 0);
+diff --git a/initd/zram.c b/initd/zram.c
+index b41bfd9..70049e6 100644
+--- a/initd/zram.c
++++ b/initd/zram.c
+@@ -116,12 +116,6 @@ mount_zram_on_tmp(void)
+ waitpid(pid, NULL, 0);
+ }
+
+- ret = mount("/dev/zram0", "/tmp", "ext4", MS_NOSUID | MS_NODEV | MS_NOATIME, "errors=continue,noquota");
+- if (ret < 0) {
+- ERROR("Can't mount /dev/zram0 on /tmp: %m\n");
+- return errno;
+- }
+-
+ LOG("Using up to %ld kB of RAM as ZRAM storage on /mnt\n", zramsize);
+
+ ret = chmod("/tmp", 01777);
+diff --git a/plug/coldplug.c b/plug/coldplug.c
+index c6a89c3..72554c3 100644
+--- a/plug/coldplug.c
++++ b/plug/coldplug.c
+@@ -43,13 +43,8 @@ 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");
+ ignore(symlink("/tmp/shm", "/dev/shm"));
+- mkdir("/dev/pts", 0755);
+ umask(oldumask);
+- mount("devpts", "/dev/pts", "devpts", MS_NOEXEC | MS_NOSUID, 0);
+ udevtrigger.cb = udevtrigger_complete;
+ udevtrigger.pid = fork();
+ if (!udevtrigger.pid) {
+--
+2.17.1
+