Attachment 111504 Details for Bug 219456

[patch] kdm.diff

kdm.diff (text/plain), 1.93 KB, created by Stefan Dirsch on 2007-01-04 15:13:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Dirsch

Created: 2007-01-04 15:13:54 UTC

Size: 1.93 KB

patch

obsolete

>diff -u -r kdm.orig/backend/ctrl.c kdm/backend/ctrl.c
>--- kdm.orig/backend/ctrl.c	2007-01-04 16:04:12.280997534 +0100
>+++ kdm/backend/ctrl.c	2007-01-04 16:06:32.132987461 +0100
>@@ -841,8 +841,10 @@
> 					}
> 					break;
> 				case remoteLogin:
>-					if (di->serverPid != -1 && nuke)
>+					if (di->serverPid != -1 && nuke) {
> 						TerminateProcess( di->serverPid, di->termSignal );
>+						system("/sbin/rmmod nvidia fglrx");
>+					}
> 					break;
> 				case reserve:
> 					di->status = notRunning;
>diff -u -r kdm.orig/backend/dm.c kdm/backend/dm.c
>--- kdm.orig/backend/dm.c	2007-01-04 16:04:12.191009766 +0100
>+++ kdm/backend/dm.c	2007-01-04 16:07:55.163700338 +0100
>@@ -1411,8 +1411,10 @@
> 	if (d->serverPid != -1 || d->pid != -1) {
> 		if (d->pid != -1)
> 			TerminateProcess( d->pid, SIGTERM );
>-		if (d->serverPid != -1)
>+		if (d->serverPid != -1) {
> 			TerminateProcess( d->serverPid, d->termSignal );
>+			system("/sbin/rmmod nvidia fglrx");
>+		}
> 		d->status = zombie;
> 		d->zstatus = endState & 0xff;
> 		Debug( " zombiefied\n" );
>@@ -1529,6 +1531,7 @@
> 			{
> 				Debug( "killing X server for %s\n", d->name );
> 				TerminateProcess( d->serverPid, d->termSignal );
>+				system("/sbin/rmmod nvidia fglrx");
> 				d->status = phoenix;
> 			} else
> 				d->status = notRunning;
>diff -u -r kdm.orig/backend/server.c kdm/backend/server.c
>--- kdm.orig/backend/server.c	2007-01-04 16:04:12.340989380 +0100
>+++ kdm/backend/server.c	2007-01-04 16:10:58.470789352 +0100
>@@ -168,12 +168,14 @@
> 	case starting:
> 		LogError( "X server startup timeout, terminating\n" );
> 		kill( d->serverPid, d->termSignal );
>+		system("/sbin/rmmod nvidia fglrx");
> 		d->serverStatus = d->termSignal == SIGKILL ? killed : terminated;
> 		serverTimeout = d->serverTimeout + now;
> 		break;
> 	case terminated:
> 		LogInfo( "X server termination timeout, killing\n" );
> 		kill( d->serverPid, SIGKILL );
>+		system("/sbin/rmmod nvidia fglrx");
> 		d->serverStatus = killed;
> 		serverTimeout = 10 + now;
> 		break;

Actions: View | Diff

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