From: Branden Robinson <[email protected]>
During normal xdm shutdown, killed local X servers
can be zombies; this is not an error.
Forward-ported by David Nusinow, Eugene Konev and Julien Cristau
---
dm.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/dm.c b/dm.c
index abe4453..e8eab0c 100644
--- a/dm.c
+++ b/dm.c
@@ -543,8 +543,17 @@ WaitForChild (void)
d->startTries, d->startAttempts);
if (d->displayType.origin == FromXDMCP ||
d->status == zombie ||
- ++d->startTries >= d->startAttempts) {
- LogError ("Display %s is being disabled\n", d->name);
+ ++d->startTries >= d->startAttempts)
+ {
+ /*
+ * During normal xdm shutdown, killed local X servers
+ * can be zombies; this is not an error.
+ */
+ if (d->status == zombie &&
+ (d->startTries < d->startAttempts))
+ LogInfo ("display %s is being disabled\n", d->name);
+ else
+ LogError ("display %s is being disabled\n", d->name);
StopDisplay(d);
} else
RestartDisplay (d, TRUE);
--
1.6.5.7
_______________________________________________
xorg-devel mailing list
[email protected]
http://lists.x.org/mailman/listinfo/xorg-devel
