aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-02-10 15:30:01 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-02-10 15:30:01 +0000
commit0e84472992345b8f32f564cad9eb8be38fd6269b (patch)
tree80b590e5461991b57f85d15db785300b4920606e /target/linux/generic
parent7eddc028e333cf43ee66a1e6b4da69af384c6a21 (diff)
downloadupstream-0e84472992345b8f32f564cad9eb8be38fd6269b.tar.gz
upstream-0e84472992345b8f32f564cad9eb8be38fd6269b.tar.bz2
upstream-0e84472992345b8f32f564cad9eb8be38fd6269b.zip
[generic/3.13]: keep initramfs the default for us
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39561 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.13/000-keep_initrafs_the_default.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.13/000-keep_initrafs_the_default.patch b/target/linux/generic/patches-3.13/000-keep_initrafs_the_default.patch
new file mode 100644
index 0000000000..b5b1955f15
--- /dev/null
+++ b/target/linux/generic/patches-3.13/000-keep_initrafs_the_default.patch
@@ -0,0 +1,25 @@
+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
+@@ -622,6 +622,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();
+@@ -629,6 +630,9 @@ int __init init_rootfs(void)
+ } else {
+ err = init_ramfs_fs();
+ }
++#else
++ err = init_ramfs_fs();
++#endif
+
+ if (err)
+ unregister_filesystem(&rootfs_fs_type);