diff options
| author | Karel Zak | 2012-11-09 12:52:33 +0100 |
|---|---|---|
| committer | Karel Zak | 2012-11-09 12:52:33 +0100 |
| commit | 27a76b7bd057c6683c5ee100f0d4e3109cc8675d (patch) | |
| tree | defebdd26bdc63c0d99eba482b770dcde12bf646 /lib/consoles.c | |
| parent | lib/consoles: add debug messages (diff) | |
| download | kernel-qcow2-util-linux-27a76b7bd057c6683c5ee100f0d4e3109cc8675d.tar.gz kernel-qcow2-util-linux-27a76b7bd057c6683c5ee100f0d4e3109cc8675d.tar.xz kernel-qcow2-util-linux-27a76b7bd057c6683c5ee100f0d4e3109cc8675d.zip | |
lib/consoles: try another methods before go to fallback
The current code goes immediately to the fallback section if any
detection method fails. It seems better to try another methods before
the fallback solution.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'lib/consoles.c')
| -rw-r--r-- | lib/consoles.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/lib/consoles.c b/lib/consoles.c index 11b7d738d..a0faa6920 100644 --- a/lib/consoles.c +++ b/lib/consoles.c @@ -598,8 +598,6 @@ console: return reconnect; /* success */ if (rc < 0) return rc; /* fatal error */ - if (rc == 1) - goto fallback; /* detection error */ /* * Detection of devices used for Linux system console using @@ -610,8 +608,6 @@ console: return reconnect; /* success */ if (rc < 0) return rc; /* fatal error */ - if (rc == 1) - goto fallback; /* detection error */ /* * Detection of devices used for Linux system console using @@ -622,8 +618,6 @@ console: return reconnect; /* success */ if (rc < 0) return rc; /* fatal error */ - if (rc == 1) - goto fallback; /* detection error */ /* * Detection of the device used for Linux system console using @@ -634,11 +628,11 @@ console: return reconnect; /* success */ if (rc < 0) return rc; /* fatal error */ - if (rc == 1) - goto fallback; /* detection error */ - DBG(dbgprint("detection success [rc=%d]", reconnect)); - return reconnect; + if (*consoles) { + DBG(dbgprint("detection success [rc=%d]", reconnect)); + return reconnect; + } #endif /* __linux __ */ |