Only print "Decompressing Linux" etc when 'noisy' is passed.
what about using "quiet" here instead ?
quiet is already the parameter to suppress boot messages, so introducing another one doesn`t make sense, imho.
the early boot commandline parser was extended some time ago to support boolean options, see:
this may shrink your patch , see example in arch/x86/boot/edd.c
be_quiet = cmdline_find_option_bool("quiet");
....
if (!be_quiet)
printf("Probing EDD (edd=off to disable)... ");roland
List: linux-kernel Subject: [PATCH 2/2] Only print "Decompressing Linux" etc when 'noisy' is passed. From: Kristian HÞgsberg <krh () redhat ! com> Date: 2008-05-23 21:59:28 Message-ID: 1211579968-15227-2-git-send-email-krh () redhat ! com
[Download message RAW]
--- arch/x86/boot/compressed/misc.c | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-)
arch/x86/boot/compressed/misc.c +27 -3
@@ -190,6 +190,7 @@ static void gzip_release(void **);*/ static struct boot_params *real_mode;/* Pointer to real-mode data */ static struct screen_info *rm_screen_info;/* Pointer to real-mode data */ +static int noisy;extern unsigned char input_data[];extern int input_len;
@@ -391,7 +392,8 @@ static void parse_elf(void *output)return ; } -putstr ("Parsing ELF... " ); +if (noisy) +putstr ("Parsing ELF... " ); phdrs =malloc (sizeof (*phdrs) * ehdr.e_phnum);if (!phdrs)
@@ -419,11 +421,27 @@ static void parse_elf(void *output) } } +static const char *strnstr (const char *string,int len,const char *s) +{ +int i, j; + +for (i =0 ; i < len; i++) { +for (j =0 ; i + j < len && s[j]; j++) +if (string[i + j] != s[j]) +break ; +if (s[j] =='\0' ) +return string + i; + } + +return NULL ; +} asmlinkage void decompress_kernel(void *rmode, memptr heap,unsigned char *input_data,unsigned long input_len,unsigned char *output) { +char *cmdline; + real_mode = rmode;if (rm_screen_info->orig_video_mode ==7 ) {
@@ -437,6 +455,10 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap, lines = rm_screen_info->orig_video_lines; cols = rm_screen_info->orig_video_cols; + cmdline = (char *) real_mode->hdr.cmd_line_ptr; +if (strnstr (cmdline, real_mode->hdr.cmdline_size,"noisy" )) + noisy =1 ; + window = output;/* Output buffer (Normally at 1M) */ free_mem_ptr = heap;/* Heap */ free_mem_end_ptr = heap +BOOT_HEAP_SIZE ;
@@ -461,9 +483,11 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,#endif makecrc (); -putstr ("\nDecompressing Linux... " ); +if (noisy) +putstr ("\nDecompressing Linux... " );gunzip ();parse_elf (output); -putstr ("done.\nBooting the kernel.\n" ); +if (noisy) +putstr ("done.\nBooting the kernel.\n" );return ; }
Signature · 4 lines
1.5.5.1 _______________________________________________________________________ EINE FÜR ALLE: die kostenlose WEB.DE-Plattform für Freunde und Deine Homepage mit eigenem Namen. Jetzt starten! http://unddu.de/?kid=kid@mf2
Quoted 3 lines · On Sat, May 24, 2008 at 09:28:21PM +0200, [email protected] wrote:
what about using "quiet" here instead ?
quiet is already the parameter to suppress boot messages, so introducing another one doesn`t make sense, imho.
I agree, and I wasn't looking to introduce a new parameter, I meant to reuse 'debug'. That is already used for increasing the log level (see init/main.c). Also, as it is, the decompressor already prints error messages if something goes wrong, so there's not much point in printing the debug spew. I think it makes sense to default to not print it.
Quoted 5 lines
the early boot commandline parser was extended some time ago to support boolean options, see:
this may shrink your patch , see example in
arch/x86/boot/edd.c
Unfortunately, that doesn't help me. This code is run before the kernel is decompressed and the only functions available are the ones in misc.c. And I know the strnstr approach isn't quite smart enough the handle quoted parameters and similar, but I think it strikes a good balance.
I'll send an updated patch that looks for 'debug' instead of 'noisy'.
thanks,
Kristian