diff options
| author | Branden Robinson <branden@debian.org> | 2010-01-05 16:40:21 +0000 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2010-01-12 18:08:17 +0000 |
| commit | cd6b6d5f78e92725d6466d138f5441d791e58212 (patch) | |
| tree | 6433eceaf11d20b94afee08481bbcd4324b97e52 | |
| parent | ecf015a4e78b96af913c1620d542c8e356f2a3d0 (diff) | |
downgrade an error to info message
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
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
| -rw-r--r-- | dm.c | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -553,8 +553,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); |