generic: copy backport, hack, pending patch and config from 5.15 to 6.1
Copy backport, hack, pending patch and config from 5.15 to 6.1. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
		
							
								
								
									
										71
									
								
								target/linux/generic/pending-6.1/920-mangle_bootargs.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										71
									
								
								target/linux/generic/pending-6.1/920-mangle_bootargs.patch
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,71 @@
 | 
			
		||||
From: Imre Kaloz <kaloz@openwrt.org>
 | 
			
		||||
Subject: init: add CONFIG_MANGLE_BOOTARGS and disable it by default
 | 
			
		||||
 | 
			
		||||
Enabling this option renames the bootloader supplied root=
 | 
			
		||||
and rootfstype= variables, which might have to be know but
 | 
			
		||||
would break the automatisms OpenWrt uses.
 | 
			
		||||
 | 
			
		||||
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
 | 
			
		||||
---
 | 
			
		||||
 init/Kconfig |  9 +++++++++
 | 
			
		||||
 init/main.c  | 24 ++++++++++++++++++++++++
 | 
			
		||||
 2 files changed, 33 insertions(+)
 | 
			
		||||
 | 
			
		||||
--- a/init/Kconfig
 | 
			
		||||
+++ b/init/Kconfig
 | 
			
		||||
@@ -1814,6 +1814,15 @@ config EMBEDDED
 | 
			
		||||
 	  an embedded system so certain expert options are available
 | 
			
		||||
 	  for configuration.
 | 
			
		||||
 
 | 
			
		||||
+config MANGLE_BOOTARGS
 | 
			
		||||
+	bool "Rename offending bootargs"
 | 
			
		||||
+	depends on EXPERT
 | 
			
		||||
+	help
 | 
			
		||||
+	  Sometimes the bootloader passed bogus root= and rootfstype=
 | 
			
		||||
+	  parameters to the kernel, and while you want to ignore them,
 | 
			
		||||
+	  you need to know the values f.e. to support dual firmware
 | 
			
		||||
+	  layouts on the flash.
 | 
			
		||||
+
 | 
			
		||||
 config HAVE_PERF_EVENTS
 | 
			
		||||
 	bool
 | 
			
		||||
 	help
 | 
			
		||||
--- a/init/main.c
 | 
			
		||||
+++ b/init/main.c
 | 
			
		||||
@@ -616,6 +616,29 @@ static inline void setup_nr_cpu_ids(void
 | 
			
		||||
 static inline void smp_prepare_cpus(unsigned int maxcpus) { }
 | 
			
		||||
 #endif
 | 
			
		||||
 
 | 
			
		||||
+#ifdef CONFIG_MANGLE_BOOTARGS
 | 
			
		||||
+static void __init mangle_bootargs(char *command_line)
 | 
			
		||||
+{
 | 
			
		||||
+	char *rootdev;
 | 
			
		||||
+	char *rootfs;
 | 
			
		||||
+
 | 
			
		||||
+	rootdev = strstr(command_line, "root=/dev/mtdblock");
 | 
			
		||||
+
 | 
			
		||||
+	if (rootdev)
 | 
			
		||||
+		strncpy(rootdev, "mangled_rootblock=", 18);
 | 
			
		||||
+
 | 
			
		||||
+	rootfs = strstr(command_line, "rootfstype");
 | 
			
		||||
+
 | 
			
		||||
+	if (rootfs)
 | 
			
		||||
+		strncpy(rootfs, "mangled_fs", 10);
 | 
			
		||||
+
 | 
			
		||||
+}
 | 
			
		||||
+#else
 | 
			
		||||
+static void __init mangle_bootargs(char *command_line)
 | 
			
		||||
+{
 | 
			
		||||
+}
 | 
			
		||||
+#endif
 | 
			
		||||
+
 | 
			
		||||
 /*
 | 
			
		||||
  * We need to store the untouched command line for future reference.
 | 
			
		||||
  * We also need to store the touched command line since the parameter
 | 
			
		||||
@@ -956,6 +979,7 @@ asmlinkage __visible void __init __no_sa
 | 
			
		||||
 	pr_notice("%s", linux_banner);
 | 
			
		||||
 	early_security_init();
 | 
			
		||||
 	setup_arch(&command_line);
 | 
			
		||||
+	mangle_bootargs(command_line);
 | 
			
		||||
 	setup_boot_config();
 | 
			
		||||
 	setup_command_line(command_line);
 | 
			
		||||
 	setup_nr_cpu_ids();
 | 
			
		||||
		Reference in New Issue
	
	Block a user