[git commit] setlogcons: open /dev/ttyN for "setlogcons N", not /dev/tty1

Denys Vlasenko vda.linux at googlemail.com
Mon Apr 16 19:48:32 UTC 2018


commit: https://git.busybox.net/busybox/commit/?id=816d8d7a668b541cee99469edb90e4917ea11c3e
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 console-tools/setlogcons.c     | 10 +++++++++-
 examples/var_service/tftpd/run |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/console-tools/setlogcons.c b/console-tools/setlogcons.c
index 6778a4d2b..0fad6600a 100644
--- a/console-tools/setlogcons.c
+++ b/console-tools/setlogcons.c
@@ -41,6 +41,7 @@
 int setlogcons_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int setlogcons_main(int argc UNUSED_PARAM, char **argv)
 {
+	char *devname;
 	struct {
 		char fn;
 		char subarg;
@@ -52,7 +53,14 @@ int setlogcons_main(int argc UNUSED_PARAM, char **argv)
 	if (argv[1])
 		arg.subarg = xatou_range(argv[1], 0, 63);
 
-	xioctl(xopen(VC_1, O_RDONLY), TIOCLINUX, &arg);
+	/* Can just call it on "/dev/tty1" always, but...
+	 * in my testing, inactive (never opened) VTs are not
+	 * redirected to, despite ioctl not failing.
+	 *
+	 * By using "/dev/ttyN", ensure it is activated.
+	 */
+	devname = xasprintf("/dev/tty%u", arg.subarg);
+	xioctl(xopen(devname, O_RDONLY), TIOCLINUX, &arg);
 
 	return EXIT_SUCCESS;
 }
diff --git a/examples/var_service/tftpd/run b/examples/var_service/tftpd/run
index e492d8453..ceb2be555 100755
--- a/examples/var_service/tftpd/run
+++ b/examples/var_service/tftpd/run
@@ -7,7 +7,7 @@ exec </dev/null
 user=root # for bind to port 69
 
 exec \
-env - \
+env - PATH="$PATH" \
 softlimit \
 setuidgid "$user" \
 udpsvd -v -c 10 -l localhost \


More information about the busybox-cvs mailing list