[PATCH] Don't pass boot parameters to argv_init[]
The boot cmdline is parsed in parse_early_param() and parse_args(,unknown_bootoption). And __setup() is used in obsolete_checksetup(). start_kernel() -> parse_args() -> unknown_bootoption() -> obsolete_checksetup() If __setup()'s callback (->setup_func()) returns 1 in obsolete_checksetup(), obsolete_checksetup() thinks a parameter was handled. If ->setup_func() returns 0, obsolete_checksetup() tries other ->setup_func(). If all ->setup_func() that matched a parameter returns 0, a parameter is seted to argv_init[]. Then, when runing /sbin/init or init=app, argv_init[] is passed to the app. If the app doesn't ignore those arguments, it will warning and exit. This patch fixes a wrong usage of it, however fixes obvious one only. Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
68eef3b479
commit
9b41046cd0
@@ -94,7 +94,7 @@ static struct console netconsole = {
|
||||
static int option_setup(char *opt)
|
||||
{
|
||||
configured = !netpoll_parse_options(&np, opt);
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
__setup("netconsole=", option_setup);
|
||||
|
@@ -1973,7 +1973,7 @@ static int __init setup_xirc2ps_cs(char *str)
|
||||
MAYBE_SET(lockup_hack, 6);
|
||||
#undef MAYBE_SET
|
||||
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
__setup("xirc2ps_cs=", setup_xirc2ps_cs);
|
||||
|
Reference in New Issue
Block a user