]> xenbits.xensource.com Git - xen.git/commitdiff
xenconsole: do not exit if a pty device is missing
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 14 Jul 2010 15:36:47 +0000 (16:36 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 14 Jul 2010 15:36:47 +0000 (16:36 +0100)
This can just mean we have raced with the bootloader exiting and if we
continue we will likely see the real domain console show up.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
tools/console/client/main.c

index 840f08eec6b6e2fef1f957e84e92cae304572a96..4289d361a69aa2f902b7dc020fd90fd329057d94 100644 (file)
@@ -115,6 +115,8 @@ static int get_pty_fd(struct xs_handle *xs, char *path, int seconds)
                         * disambiguate: just read the pty path */
                        pty_path = xs_read(xs, XBT_NULL, path, &len);
                        if (pty_path != NULL) {
+                               if (access(pty_path, R_OK|W_OK) != 0)
+                                       continue;
                                pty_fd = open(pty_path, O_RDWR | O_NOCTTY);
                                if (pty_fd == -1) 
                                        err(errno, "Could not open tty `%s'",