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.

61 lines
2.2 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/x11/xfree86/devfs-vc.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- xc/programs/Xserver/hw/tinyx/linux/linux.c 2004-06-27 13:01:19.000000000 +0200
  20. +++ xc-p/programs/Xserver/hw/tinyx/linux/linux.c 2004-11-11 22:20:32.022231840 +0100
  21. @@ -125,10 +125,10 @@
  22. vtno = kdVirtualTerminal;
  23. else
  24. {
  25. - if ((fd = open("/dev/tty0",O_WRONLY,0)) < 0)
  26. + if ((fd = open("/dev/vc/0",O_WRONLY,0)) < 0)
  27. {
  28. FatalError(
  29. - "LinuxInit: Cannot open /dev/tty0 (%s)\n",
  30. + "LinuxInit: Cannot open /dev/vc/0 (%s)\n",
  31. strerror(errno));
  32. }
  33. if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) ||
  34. @@ -139,7 +139,7 @@
  35. close(fd);
  36. }
  37. - sprintf(vtname,"/dev/tty%d",vtno); /* /dev/tty1-64 */
  38. + sprintf(vtname,"/dev/vc/%d",vtno); /* /dev/vc/1-64 */
  39. if ((LinuxConsoleFd = open(vtname, O_RDWR|O_NDELAY, 0)) < 0)
  40. {
  41. @@ -156,7 +156,7 @@
  42. *
  43. * Why is this needed?
  44. */
  45. - LinuxCheckChown ("/dev/tty0");
  46. + LinuxCheckChown ("/dev/vc/0");
  47. /*
  48. * Linux doesn't switch to an active vt after the last close of a vt,
  49. * so we do this ourselves by remembering which is active now.
  50. @@ -483,7 +483,7 @@
  51. activeVT = -1;
  52. }
  53. close(LinuxConsoleFd); /* make the vt-manager happy */
  54. - fd = open ("/dev/tty0", O_RDWR|O_NDELAY, 0);
  55. + fd = open ("/dev/vc/0", O_RDWR|O_NDELAY, 0);
  56. if (fd >= 0)
  57. {
  58. ioctl (fd, VT_GETSTATE, &vts);