[OpenWrt-Devel] [PATCH] linux: Get rid of 000-keep_initrafs_the_default.patch

[Alexey Brodkin]

With that patch in place for initramfs no additional options are
reported for "/" partition. What's really important is missing
info about sizes. Which in its turn makes opkg think that there's
no space on "/" partition to install software.

I understand that's a sort of corner-case, people rarely install
packages on ramfs but anyways why not?

Just in case that's what I see with the patch:
---------------------->8--------------------
root at lede:/# cat /proc/mounts
rootfs / rootfs rw 0 0
proc /proc proc rw,nosuid,nodev,noexec,noatime 0 0
sysfs /sys sysfs rw,nosuid,nodev,noexec,noatime 0 0
tmpfs /tmp tmpfs rw,nosuid,nodev,noatime 0 0
tmpfs /dev tmpfs rw,nosuid,relatime,size=512k,mode=755 0 0
devpts /dev/pts devpts rw,nosuid,noexec,relatime,mode=600 0 0
debugfs /sys/kernel/debug debugfs rw,noatime 0 0
---------------------->8--------------------

And without:
---------------------->8--------------------
root at lede:/# cat /proc/mounts
rootfs / rootfs rw,size=256168k,nr_inodes=32021 0 0
proc /proc proc rw,nosuid,nodev,noexec,noatime 0 0
sysfs /sys sysfs rw,nosuid,nodev,noexec,noatime 0 0
tmpfs /tmp tmpfs rw,nosuid,nodev,noatime 0 0
tmpfs /dev tmpfs rw,nosuid,relatime,size=512k,mode=755 0 0
devpts /dev/pts devpts rw,nosuid,noexec,relatime,mode=600 0 0
debugfs /sys/kernel/debug debugfs rw,noatime 0 0
---------------------->8--------------------

Note how different is entry for rootfs.

And given there's no known rationale for that patch we're
getting rid of it.

Signed-off-by: Alexey Brodkin <abrodkin at synopsys.com>
Cc: Jonas Gorski <jonas.gorski at gmail.com>
Cc: Rafał Miłecki <zajec5 at gmail.com>
Cc: John Crispin <john at phrozen.org>
Cc: Felix Fietkau <nbd at nbd.name>
---
 .../000-keep_initrafs_the_default.patch            | 25 ----------------------
 .../000-keep_initrafs_the_default.patch            | 25 ----------------------
 .../000-keep_initrafs_the_default.patch            | 25 ----------------------
 3 files changed, 75 deletions(-)
 delete mode 100644 target/linux/generic/patches-3.18/000-keep_initrafs_the_default.patch
 delete mode 100644 target/linux/generic/patches-4.1/000-keep_initrafs_the_default.patch
 delete mode 100644 target/linux/generic/patches-4.4/000-keep_initrafs_the_default.patch

diff --git a/target/linux/generic/patches-3.18/000-keep_initrafs_the_default.patch b/target/linux/generic/patches-3.18/000-keep_initrafs_the_default.patch
deleted file mode 100644
index d4164ca..0000000
--- a/target/linux/generic/patches-3.18/000-keep_initrafs_the_default.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream changed the default rootfs to tmpfs when none has been passed
-to the kernel - this doesn't fit our purposes, so change it back.
-
-Signed-off-by: Imre Kaloz <kaloz at openwrt.org>
-
---- a/init/do_mounts.c
-+++ b/init/do_mounts.c
-@@ -623,6 +623,7 @@ int __init init_rootfs(void)
- 	if (err)
- 		return err;
- 
-+#if 0
- 	if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] &&
- 		(!root_fs_names || strstr(root_fs_names, "tmpfs"))) {
- 		err = shmem_init();
-@@ -630,6 +631,9 @@ int __init init_rootfs(void)
- 	} else {
- 		err = init_ramfs_fs();
- 	}
-+#else
-+	err = init_ramfs_fs();
-+#endif
- 
- 	if (err)
- 		unregister_filesystem(&rootfs_fs_type);
diff --git a/target/linux/generic/patches-4.1/000-keep_initrafs_the_default.patch b/target/linux/generic/patches-4.1/000-keep_initrafs_the_default.patch
deleted file mode 100644
index 5e56d44..0000000
--- a/target/linux/generic/patches-4.1/000-keep_initrafs_the_default.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream changed the default rootfs to tmpfs when none has been passed
-to the kernel - this doesn't fit our purposes, so change it back.
-
-Signed-off-by: Imre Kaloz <kaloz at openwrt.org>
-
---- a/init/do_mounts.c
-+++ b/init/do_mounts.c
-@@ -628,6 +628,7 @@ int __init init_rootfs(void)
- 	if (err)
- 		return err;
- 
-+#if 0
- 	if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] &&
- 		(!root_fs_names || strstr(root_fs_names, "tmpfs"))) {
- 		err = shmem_init();
-@@ -635,6 +636,9 @@ int __init init_rootfs(void)
- 	} else {
- 		err = init_ramfs_fs();
- 	}
-+#else
-+	err = init_ramfs_fs();
-+#endif
- 
- 	if (err)
- 		unregister_filesystem(&rootfs_fs_type);
diff --git a/target/linux/generic/patches-4.4/000-keep_initrafs_the_default.patch b/target/linux/generic/patches-4.4/000-keep_initrafs_the_default.patch
deleted file mode 100644
index e6f1be4..0000000
--- a/target/linux/generic/patches-4.4/000-keep_initrafs_the_default.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream changed the default rootfs to tmpfs when none has been passed
-to the kernel - this doesn't fit our purposes, so change it back.
-
-Signed-off-by: Imre Kaloz <kaloz at openwrt.org>
-
---- a/init/do_mounts.c
-+++ b/init/do_mounts.c
-@@ -633,6 +633,7 @@ int __init init_rootfs(void)
- 	if (err)
- 		return err;
- 
-+#if 0
- 	if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] &&
- 		(!root_fs_names || strstr(root_fs_names, "tmpfs"))) {
- 		err = shmem_init();
-@@ -640,6 +641,9 @@ int __init init_rootfs(void)
- 	} else {
- 		err = init_ramfs_fs();
- 	}
-+#else
-+	err = init_ramfs_fs();
-+#endif
- 
- 	if (err)
- 		unregister_filesystem(&rootfs_fs_type);
-- 
2.7.4
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel