mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-10-30 21:44:27 -04:00 
			
		
		
		
	Boot tested: http://pastebin.com/L6aAb9xj Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> [jogo: update to 4.1 final add patches added since submission delete patches applied in later rcs restore commit messages in 220-gc-sections and 304-mips_disable_fpu fix 050-backport_netfilter_rtcache to match new API update inlined dma ops with upstream changes add missing config symbols enabled CONFIG_MULTIUSER update kmod defintions for 4.1 ] Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46112
		
			
				
	
	
		
			26 lines
		
	
	
		
			638 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			26 lines
		
	
	
		
			638 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
| 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);
 |