[PATCH 1/2] UML - Fix umid in xterm titles

[PATCH 1/2] UML - Fix umid in xterm titles

[Jeff Dike]

From: Davide Brini <davide.brini@unibo.it>

Calls lines_init() *after* xterm_title is modified to include umid.

Signed-off-by: Davide Brini <davide.brini@unibo.it>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
--
 arch/um/drivers/ssl.c           |    4 ++--
 arch/um/drivers/stdio_console.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: linux-2.6.21-mm/arch/um/drivers/ssl.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/drivers/ssl.c	2007-03-30 10:11:01.000000000 -0400
+++ linux-2.6.21-mm/arch/um/drivers/ssl.c	2007-03-30 10:28:51.000000000 -0400
@@ -191,12 +191,12 @@ static int ssl_init(void)
 	ssl_driver = register_lines(&driver, &ssl_ops, serial_lines,
 				    ARRAY_SIZE(serial_lines));
 
-	lines_init(serial_lines, ARRAY_SIZE(serial_lines), &opts);
-
 	new_title = add_xterm_umid(opts.xterm_title);
 	if (new_title != NULL)
 		opts.xterm_title = new_title;
 
+	lines_init(serial_lines, ARRAY_SIZE(serial_lines), &opts);
+
 	ssl_init_done = 1;
 	register_console(&ssl_cons);
 	return 0;
Index: linux-2.6.21-mm/arch/um/drivers/stdio_console.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/drivers/stdio_console.c	2007-03-30 10:11:01.000000000 -0400
+++ linux-2.6.21-mm/arch/um/drivers/stdio_console.c	2007-03-30 10:28:51.000000000 -0400
@@ -166,12 +166,12 @@ int stdio_init(void)
 		return -1;
 	printk(KERN_INFO "Initialized stdio console driver\n");
 
-	lines_init(vts, ARRAY_SIZE(vts), &opts);
-
 	new_title = add_xterm_umid(opts.xterm_title);
 	if(new_title != NULL)
 		opts.xterm_title = new_title;
 
+	lines_init(vts, ARRAY_SIZE(vts), &opts);
+
 	con_init_done = 1;
 	register_console(&stdiocons);
 	return 0;

Re: [uml-devel] [PATCH 1/2] UML - Fix umid in xterm titles

[Blaisorblade]

On venerdì 30 marzo 2007, Jeff Dike wrote:
> From: Davide Brini <davide.brini@unibo.it>
>
> Calls lines_init() *after* xterm_title is modified to include umid.
>
> Signed-off-by: Davide Brini <davide.brini@unibo.it>
> Signed-off-by: Jeff Dike <jdike@linux.intel.com>

Acked-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

> --
>  arch/um/drivers/ssl.c           |    4 ++--
>  arch/um/drivers/stdio_console.c |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> Index: linux-2.6.21-mm/arch/um/drivers/ssl.c
> ===================================================================
> --- linux-2.6.21-mm.orig/arch/um/drivers/ssl.c	2007-03-30
> 10:11:01.000000000 -0400 +++
> linux-2.6.21-mm/arch/um/drivers/ssl.c	2007-03-30 10:28:51.000000000 -0400
> @@ -191,12 +191,12 @@ static int ssl_init(void)
>  	ssl_driver = register_lines(&driver, &ssl_ops, serial_lines,
>  				    ARRAY_SIZE(serial_lines));
>
> -	lines_init(serial_lines, ARRAY_SIZE(serial_lines), &opts);
> -
>  	new_title = add_xterm_umid(opts.xterm_title);
>  	if (new_title != NULL)
>  		opts.xterm_title = new_title;
>
> +	lines_init(serial_lines, ARRAY_SIZE(serial_lines), &opts);
> +
>  	ssl_init_done = 1;
>  	register_console(&ssl_cons);
>  	return 0;
> Index: linux-2.6.21-mm/arch/um/drivers/stdio_console.c
> ===================================================================
> --- linux-2.6.21-mm.orig/arch/um/drivers/stdio_console.c	2007-03-30
> 10:11:01.000000000 -0400 +++
> linux-2.6.21-mm/arch/um/drivers/stdio_console.c	2007-03-30
> 10:28:51.000000000 -0400 @@ -166,12 +166,12 @@ int stdio_init(void)
>  		return -1;
>  	printk(KERN_INFO "Initialized stdio console driver\n");
>
> -	lines_init(vts, ARRAY_SIZE(vts), &opts);
> -
>  	new_title = add_xterm_umid(opts.xterm_title);
>  	if(new_title != NULL)
>  		opts.xterm_title = new_title;
>
> +	lines_init(vts, ARRAY_SIZE(vts), &opts);
> +
>  	con_init_done = 1;
>  	register_console(&stdiocons);
>  	return 0;
>
> -------------------------------------------------------------------------
> Take Surveys. Earn Cash. Influence the Future of IT
> Join SourceForge.net's Techsay panel and you'll get the chance to share
> your opinions on IT & business topics through brief surveys-and earn cash
> http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
> _______________________________________________
> User-mode-linux-devel mailing list
> User-mode-linux-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel



-- 
Inform me of my mistakes, so I can add them to my list!
Paolo Giarrusso, aka Blaisorblade
http://www.user-mode-linux.org/~blaisorblade