hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

generic: 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>



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45196 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Imre Kaloz 2015-03-31 19:18:03 +00:00
parent 6a7e2baea5
commit 6f5acae617
4 changed files with 112 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/linux/generic/config-3.18
View File

@ -1910,6 +1910,7 @@ CONFIG_LZMA_DECOMPRESS=y
# CONFIG_MAGIC_SYSRQ is not set
CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
# CONFIG_MAILBOX is not set
# CONFIG_MANGLE_BOOTARGS is not set
# CONFIG_MARVELL_PHY is not set
# CONFIG_MAX1027 is not set
# CONFIG_MAX1363 is not set

1
target/linux/generic/config-4.0
View File

@ -1945,6 +1945,7 @@ CONFIG_LZMA_DECOMPRESS=y
# CONFIG_MAGIC_SYSRQ is not set
CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
# CONFIG_MAILBOX is not set
# CONFIG_MANGLE_BOOTARGS is not set
# CONFIG_MARVELL_PHY is not set
# CONFIG_MAX1027 is not set
# CONFIG_MAX1363 is not set

55
target/linux/generic/patches-3.18/995-mangle_bootargs.patch Normal file
View File

@ -0,0 +1,55 @@
--- a/init/main.c
+++ b/init/main.c
@@ -379,6 +379,26 @@ static void __init setup_command_line(ch
strcpy(static_command_line, command_line);
}
+#ifdef CONFIG_MANGLE_BOOTARGS
+static void __init mangle_bootargs(char *command_line)
+{
+ char *rootdev;
+ char *rootfs;
+
+ rootdev = strstr(command_line, "root=/dev/mtdblock");
+ strncpy(rootdev, "mangled_rootblock=", 18);
+
+ rootfs = strstr(command_line, "rootfstype");
+ strncpy(rootfs, "mangled_fs", 10);
+
+}
+#else
+static void __init mangle_bootargs(char *command_line)
+{
+}
+#endif
+
+
/*
* We need to finalize in a non-__init function or else race conditions
* between the root thread and the init thread may cause start_kernel to
@@ -530,6 +550,7 @@ asmlinkage __visible void __init start_k
pr_notice("%s", linux_banner);
setup_arch(&command_line);
mm_init_cpumask(&init_mm);
+ mangle_bootargs(command_line);
setup_command_line(command_line);
setup_nr_cpu_ids();
setup_per_cpu_areas();
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1597,6 +1597,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

55
target/linux/generic/patches-4.0/995-mangle_bootargs.patch Normal file
View File

@ -0,0 +1,55 @@
--- a/init/main.c
+++ b/init/main.c
@@ -368,6 +368,26 @@ static void __init setup_command_line(ch
strcpy(static_command_line, command_line);
}
+#ifdef CONFIG_MANGLE_BOOTARGS
+static void __init mangle_bootargs(char *command_line)
+{
+ char *rootdev;
+ char *rootfs;
+
+ rootdev = strstr(command_line, "root=/dev/mtdblock");
+ strncpy(rootdev, "mangled_rootblock=", 18);
+
+ rootfs = strstr(command_line, "rootfstype");
+ strncpy(rootfs, "mangled_fs", 10);
+
+}
+#else
+static void __init mangle_bootargs(char *command_line)
+{
+}
+#endif
+
+
/*
* We need to finalize in a non-__init function or else race conditions
* between the root thread and the init thread may cause start_kernel to
@@ -519,6 +539,7 @@ asmlinkage __visible void __init start_k
pr_notice("%s", linux_banner);
setup_arch(&command_line);
mm_init_cpumask(&init_mm);
+ mangle_bootargs(command_line);
setup_command_line(command_line);
setup_nr_cpu_ids();
setup_per_cpu_areas();
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1583,6 +1583,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