mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

42 lines
1.3 KiB

  1. --- xc/programs/Xserver/hw/tinyx/linux/linux.c 2004-06-27 13:01:19.000000000 +0200
  2. +++ xc-p/programs/Xserver/hw/tinyx/linux/linux.c 2004-11-11 22:20:32.022231840 +0100
  3. @@ -125,10 +125,10 @@
  4. vtno = kdVirtualTerminal;
  5. else
  6. {
  7. - if ((fd = open("/dev/tty0",O_WRONLY,0)) < 0)
  8. + if ((fd = open("/dev/vc/0",O_WRONLY,0)) < 0)
  9. {
  10. FatalError(
  11. - "LinuxInit: Cannot open /dev/tty0 (%s)\n",
  12. + "LinuxInit: Cannot open /dev/vc/0 (%s)\n",
  13. strerror(errno));
  14. }
  15. if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) ||
  16. @@ -139,7 +139,7 @@
  17. close(fd);
  18. }
  19. - sprintf(vtname,"/dev/tty%d",vtno); /* /dev/tty1-64 */
  20. + sprintf(vtname,"/dev/vc/%d",vtno); /* /dev/vc/1-64 */
  21. if ((LinuxConsoleFd = open(vtname, O_RDWR|O_NDELAY, 0)) < 0)
  22. {
  23. @@ -156,7 +156,7 @@
  24. *
  25. * Why is this needed?
  26. */
  27. - LinuxCheckChown ("/dev/tty0");
  28. + LinuxCheckChown ("/dev/vc/0");
  29. /*
  30. * Linux doesn't switch to an active vt after the last close of a vt,
  31. * so we do this ourselves by remembering which is active now.
  32. @@ -483,7 +483,7 @@
  33. activeVT = -1;
  34. }
  35. close(LinuxConsoleFd); /* make the vt-manager happy */
  36. - fd = open ("/dev/tty0", O_RDWR|O_NDELAY, 0);
  37. + fd = open ("/dev/vc/0", O_RDWR|O_NDELAY, 0);
  38. if (fd >= 0)
  39. {
  40. ioctl (fd, VT_GETSTATE, &vts);