aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorAlexey Brodkin <Alexey.Brodkin@synopsys.com>2016-07-22 13:18:41 +0300
committerFelix Fietkau <nbd@nbd.name>2016-07-23 19:04:37 +0200
commit18f368fa35269aba4ad444d3a4bae06d4608a2c8 (patch)
tree1955e8522209c61db6603d3576d986787aba131f /target
parent600fd467d8e884a9d2d36e996f9680f215bdd0dd (diff)
downloadupstream-18f368fa35269aba4ad444d3a4bae06d4608a2c8.tar.gz
upstream-18f368fa35269aba4ad444d3a4bae06d4608a2c8.tar.bz2
upstream-18f368fa35269aba4ad444d3a4bae06d4608a2c8.zip
linux: Get rid of 000-keep_initrafs_the_default.patch
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@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@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@synopsys.com> Cc: Jonas Gorski <jonas.gorski@gmail.com> Cc: Rafał Miłecki <zajec5@gmail.com> Cc: John Crispin <john@phrozen.org> Cc: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/patches-3.18/000-keep_initrafs_the_default.patch25
-rw-r--r--target/linux/generic/patches-4.1/000-keep_initrafs_the_default.patch25
-rw-r--r--target/linux/generic/patches-4.4/000-keep_initrafs_the_default.patch25
3 files changed, 0 insertions, 75 deletions
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 d4164ca26b..0000000000
--- 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@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 5e56d4415d..0000000000
--- 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@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 e6f1be45f8..0000000000
--- 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@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);