On Tue, Dec 05, 2006 at 06:24:09PM +0100, Herbert Poetzl wrote: > On Mon, Dec 04, 2006 at 11:32:48PM +0100, Herbert Poetzl wrote: > > > > utsname information is shown in the linux banner, which > > also is used for /proc/version (which can have different > > utsname values inside a uts namespaces). this patch > > makes the varying data arguments and changes the string > > to a format string, using those arguments. > > > > best, > > Herbert > > d'oh! just figured I lost the two new includes required > in main.c, will send an updated version shortly
okay, here is the complete and tested version ... Signed-off-by: Herbert Poetzl <[EMAIL PROTECTED]> --- linux-2.6.19/fs/proc/proc_misc.c 2006-11-30 21:19:28 +0100 +++ linux-2.6.19-banner/fs/proc/proc_misc.c 2006-12-06 07:10:41 +0100 @@ -252,8 +252,8 @@ static int version_read_proc(char *page, { int len; - strcpy(page, linux_banner); - len = strlen(page); + len = sprintf(page, linux_banner, + utsname()->release, utsname()->version); return proc_calc_metrics(page, start, off, count, eof, len); } --- linux-2.6.19/init/Makefile 2006-09-20 16:58:44 +0200 +++ linux-2.6.19-banner/init/Makefile 2006-12-06 07:10:41 +0100 @@ -15,6 +15,7 @@ clean-files := ../include/linux/compile. # dependencies on generated files need to be listed explicitly +$(obj)/main.o: include/linux/compile.h $(obj)/version.o: include/linux/compile.h # compile.h changes depending on hostname, generation number, etc, --- linux-2.6.19/init/main.c 2006-11-30 21:19:43 +0100 +++ linux-2.6.19-banner/init/main.c 2006-12-06 07:10:41 +0100 @@ -49,6 +49,8 @@ #include <linux/buffer_head.h> #include <linux/debug_locks.h> #include <linux/lockdep.h> +#include <linux/utsrelease.h> +#include <linux/compile.h> #include <asm/io.h> #include <asm/bugs.h> @@ -501,7 +503,7 @@ asmlinkage void __init start_kernel(void boot_cpu_init(); page_address_init(); printk(KERN_NOTICE); - printk(linux_banner); + printk(linux_banner, UTS_RELEASE, UTS_VERSION); setup_arch(&command_line); unwind_setup(); setup_per_cpu_areas(); --- linux-2.6.19/init/version.c 2006-11-30 21:19:43 +0100 +++ linux-2.6.19-banner/init/version.c 2006-12-06 07:10:41 +0100 @@ -35,5 +35,6 @@ struct uts_namespace init_uts_ns = { EXPORT_SYMBOL_GPL(init_uts_ns); const char linux_banner[] = - "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@" - LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n"; + "Linux version %s (" LINUX_COMPILE_BY "@" + LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") %s\n"; + - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/