Attachment 111512 Details for Bug 219456

[patch] gdm.diff

gdm.diff (text/plain), 2.94 KB, created by Stefan Dirsch on 2007-01-04 15:32:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Dirsch

Created: 2007-01-04 15:32:55 UTC

Size: 2.94 KB

patch

obsolete

>diff -u -r gdm-2.16.1.orig/daemon/display.c gdm-2.16.1/daemon/display.c
>--- gdm-2.16.1.orig/daemon/display.c	2007-01-04 16:18:13.594674200 +0100
>+++ gdm-2.16.1/daemon/display.c	2007-01-04 16:19:25.684878398 +0100
>@@ -225,8 +225,10 @@
> 		    if (d->chooserpid > 1)
> 			    kill (-(d->chooserpid), SIGTERM);
> 		    d->chooserpid = 0;
>-		    if (d->servpid > 1)
>+		    if (d->servpid > 1) {
> 			    kill (d->servpid, SIGTERM);
>+			    system("/sbin/rmmod nvidia fglrx");
>+		    }
> 		    d->servpid = 0;
> 	    }
>     }
>diff -u -r gdm-2.16.1.orig/daemon/gdm.c gdm-2.16.1/daemon/gdm.c
>--- gdm-2.16.1.orig/daemon/gdm.c	2007-01-04 16:18:13.626669852 +0100
>+++ gdm-2.16.1/daemon/gdm.c	2007-01-04 16:20:10.211827722 +0100
>@@ -776,8 +776,10 @@
> 	    if (d->chooserpid > 1)
> 		    kill (-(d->chooserpid), SIGTERM);
> 	    d->chooserpid = 0;
>-	    if (d->servpid > 1)
>+	    if (d->servpid > 1) {
> 		    kill (d->servpid, SIGTERM);
>+		    system("/sbin/rmmod nvidia fglrx");
>+	    }
> 	    d->servpid = 0;
> 
>             if (gdm_get_value_bool (GDM_KEY_DYNAMIC_XSERVERS)) {
>diff -u -r gdm-2.16.1.orig/daemon/server.c gdm-2.16.1/daemon/server.c
>--- gdm-2.16.1.orig/daemon/server.c	2007-01-04 16:18:13.869636838 +0100
>+++ gdm-2.16.1/daemon/server.c	2007-01-04 16:30:51.574639135 +0100
>@@ -301,12 +301,15 @@
> 
> 	    if (waiting_for_server) {
> 		    gdm_error ("gdm_server_stop: Some problem killing server, whacking with SIGKILL");
>-		    if (disp->servpid > 1)
>+		    if (disp->servpid > 1) {
> 			    kill (disp->servpid, SIGKILL);
>+			    system("/sbin/rmmod nvidia fglrx");
>+		    }
> 
> 	    } else {
> 		    if (disp->servpid > 1 &&
> 			kill (disp->servpid, SIGTERM) == 0) {
>+			    system("/sbin/rmmod nvidia fglrx");
> 			    waiting_for_server = TRUE;
> 			    ve_waitpid_no_signal (disp->servpid, NULL, 0);
> 			    waiting_for_server = FALSE;
>@@ -1105,8 +1108,10 @@
> 	    pid_t pid = d->servpid;
> 	    d->servpid = 0;
> 	    if (pid > 1 &&
>-		kill (pid, SIGTERM) == 0)
>+		kill (pid, SIGTERM) == 0) {
>+		    system("/sbin/rmmod nvidia fglrx");
> 		    ve_waitpid_no_signal (pid, NULL, 0);
>+	        }
>     }
> 
>     /* Figure out the server command */
>diff -u -r gdm-2.16.1.orig/daemon/slave.c gdm-2.16.1/daemon/slave.c
>--- gdm-2.16.1.orig/daemon/slave.c	2007-01-04 16:18:13.707658847 +0100
>+++ gdm-2.16.1/daemon/slave.c	2007-01-04 16:21:54.375672427 +0100
>@@ -4545,8 +4545,10 @@
> 		if (extra_process > 1)
> 			kill (-(extra_process), SIGKILL);
> 		/* also be very nasty to the X server at this stage */
>-		if (d->servpid > 1)
>+		if (d->servpid > 1) {
> 			kill (d->servpid, SIGKILL);
>+			system("/sbin/rmmod nvidia fglrx");
>+		}
> 		gdm_sigchld_block_pop ();
> 		gdm_in_signal--;
> 		got_term_before = TRUE;
>@@ -5076,8 +5078,10 @@
> 	    gdm_verify_cleanup (d);
> 	    gdm_server_stop (d);
> 
>-	    if (d->servpid > 1)
>+	    if (d->servpid > 1) {
> 		    kill (d->servpid, SIGTERM);
>+		    system("/sbin/rmmod nvidia fglrx");
>+	    }
> 	    d->servpid = 0;
> 
> 	    gdm_debug ("gdm_slave_quick_exit: Killed everything from the display");

Actions: View | Diff

Attachments on bug 219456: 111497 | 111504 | 111512 | 111584 | 111853 | 111855