001-um-fix-default-console-kernel-parameter.patch 2.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. From 53b5c5f559cc95fc676cb4cc9e5a8d9f0cb8f58c Mon Sep 17 00:00:00 2001
  2. Message-Id: <53b5c5f559cc95fc676cb4cc9e5a8d9f0cb8f58c.1659815468.git.chunkeey@gmail.com>
  3. From: Christian Lamparter <[email protected]>
  4. Date: Sat, 6 Aug 2022 21:22:01 +0200
  5. Subject: [PATCH v1 1/2] um: fix default console kernel parameter
  6. To: [email protected]
  7. Cc: Richard Weinberger <[email protected]>,
  8. Anton Ivanov <[email protected]>,
  9. Johannes Berg <[email protected]>
  10. OpenWrt's UML with 5.15 was producing odd errors/warnings during preinit
  11. part of the early userspace portion:
  12. |[ 0.000000] Kernel command line: ubd0=root.img root=98:0 console=tty
  13. |[...]
  14. |[ 0.440000] random: jshn: uninitialized urandom read (4 bytes read)
  15. |[ 0.460000] random: jshn: uninitialized urandom read (4 bytes read)
  16. |/etc/preinit: line 47: can't create /dev/tty: No such device or address
  17. |/etc/preinit: line 48: can't create /dev/tty: No such device or address
  18. |/etc/preinit: line 58: can't open /dev/tty: No such device or address
  19. |[...] repeated many times
  20. That "/dev/tty" came from the command line (which is automatically
  21. added if no console= parameter was specified for the uml binary).
  22. The TLDP project tells the following about the /dev/tty:
  23. <https://tldp.org/HOWTO/Text-Terminal-HOWTO-7.html#ss7.3>
  24. | /dev/tty stands for the controlling terminal (if any) for the current
  25. | process.[...]
  26. | /dev/tty is something like a link to the actually terminal device[..]
  27. The "(if any)" is important here, since it's possible for processes to
  28. not have a controlling terminal.
  29. I think this was a simple typo and the author wanted tty0 there.
  30. CC: Thomas Meyer <[email protected]>
  31. Fixes: d7ffac33631b ("um: stdio_console: Make preferred console")
  32. Signed-off-by: Christian Lamparter <[email protected]>
  33. ---
  34. arch/um/kernel/um_arch.c | 2 +-
  35. 1 file changed, 1 insertion(+), 1 deletion(-)
  36. --- a/arch/um/kernel/um_arch.c
  37. +++ b/arch/um/kernel/um_arch.c
  38. @@ -31,7 +31,7 @@
  39. #include <os.h>
  40. #define DEFAULT_COMMAND_LINE_ROOT "root=98:0"
  41. -#define DEFAULT_COMMAND_LINE_CONSOLE "console=tty"
  42. +#define DEFAULT_COMMAND_LINE_CONSOLE "console=tty0"
  43. /* Changed in add_arg and setup_arch, which run before SMP is started */
  44. static char __initdata command_line[COMMAND_LINE_SIZE] = { 0 };