caskd/openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

generic: make sure we only try to mangle bootargs we do have

Browse Source 
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 45393
This commit is contained in:
Imre Kaloz 2015-04-12 14:46:19 +00:00
parent 95ef64a779
commit 6cfe1539da
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
target/linux/generic/patches-3.18/995-mangle_bootargs.patch
View File

@ -1,8 +1,8 @@
--- a/init/main.c --- a/init/main.c
+++ b/init/main.c +++ b/init/main.c
@@ -379,6 +379,26 @@ static void __init setup_command_line(ch @@ -362,6 +362,29 @@ static inline void setup_nr_cpu_ids(void
strcpy(static_command_line, command_line); static inline void smp_prepare_cpus(unsigned int maxcpus) { }
} #endif
+#ifdef CONFIG_MANGLE_BOOTARGS +#ifdef CONFIG_MANGLE_BOOTARGS
+static void __init mangle_bootargs(char *command_line) +static void __init mangle_bootargs(char *command_line)
@ -11,10 +11,14 @@
+ char *rootfs; + char *rootfs;
+ +
+ rootdev = strstr(command_line, "root=/dev/mtdblock"); + rootdev = strstr(command_line, "root=/dev/mtdblock");
+ strncpy(rootdev, "mangled_rootblock=", 18); +
+ if (rootdev)
+ strncpy(rootdev, "mangled_rootblock=", 18);
+ +
+ rootfs = strstr(command_line, "rootfstype"); + rootfs = strstr(command_line, "rootfstype");
+ strncpy(rootfs, "mangled_fs", 10); +
+ if (rootfs)
+ strncpy(rootfs, "mangled_fs", 10);
+ +
+} +}
+#else +#else
@ -22,12 +26,11 @@
+{ +{
+} +}
+#endif +#endif
+
+ +
/* /*
* We need to finalize in a non-__init function or else race conditions * We need to store the untouched command line for future reference.
* between the root thread and the init thread may cause start_kernel to * We also need to store the touched command line since the parameter
@@ -530,6 +550,7 @@ asmlinkage __visible void __init start_k @@ -530,6 +553,7 @@ asmlinkage __visible void __init start_k
pr_notice("%s", linux_banner); pr_notice("%s", linux_banner);
setup_arch(&command_line); setup_arch(&command_line);
mm_init_cpumask(&init_mm); mm_init_cpumask(&init_mm);

21
target/linux/generic/patches-4.0/995-mangle_bootargs.patch
View File

@ -1,8 +1,8 @@
--- a/init/main.c --- a/init/main.c
+++ b/init/main.c +++ b/init/main.c
@@ -368,6 +368,26 @@ static void __init setup_command_line(ch @@ -351,6 +351,29 @@ static inline void setup_nr_cpu_ids(void
strcpy(static_command_line, command_line); static inline void smp_prepare_cpus(unsigned int maxcpus) { }
} #endif
+#ifdef CONFIG_MANGLE_BOOTARGS +#ifdef CONFIG_MANGLE_BOOTARGS
+static void __init mangle_bootargs(char *command_line) +static void __init mangle_bootargs(char *command_line)
@ -11,10 +11,14 @@
+ char *rootfs; + char *rootfs;
+ +
+ rootdev = strstr(command_line, "root=/dev/mtdblock"); + rootdev = strstr(command_line, "root=/dev/mtdblock");
+ strncpy(rootdev, "mangled_rootblock=", 18); +
+ if (rootdev)
+ strncpy(rootdev, "mangled_rootblock=", 18);
+ +
+ rootfs = strstr(command_line, "rootfstype"); + rootfs = strstr(command_line, "rootfstype");
+ strncpy(rootfs, "mangled_fs", 10); +
+ if (rootfs)
+ strncpy(rootfs, "mangled_fs", 10);
+ +
+} +}
+#else +#else
@ -22,12 +26,11 @@
+{ +{
+} +}
+#endif +#endif
+
+ +
/* /*
* We need to finalize in a non-__init function or else race conditions * We need to store the untouched command line for future reference.
* between the root thread and the init thread may cause start_kernel to * We also need to store the touched command line since the parameter
@@ -519,6 +539,7 @@ asmlinkage __visible void __init start_k @@ -519,6 +542,7 @@ asmlinkage __visible void __init start_k
pr_notice("%s", linux_banner); pr_notice("%s", linux_banner);
setup_arch(&command_line); setup_arch(&command_line);
mm_init_cpumask(&init_mm); mm_init_cpumask(&init_mm);