setconsole: much better help text
Was:
Usage: setconsole [-r] [DEVICE]
Redirect system console output to DEVICE (default: /dev/tty)
-r Reset output to /dev/console
Now:
Usage: setconsole [-r] [DEVICE]
Make writes to /dev/console appear on DEVICE (default: /dev/tty).
Does not redirect kernel log output or reads from /dev/console.
-r Reset: writes to /dev/console go to kernel log tty(s)
function old new delta
packed_usage 31766 31777 +11
setconsole_main 84 78 -6
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c
index 9a8ca38..8f4b7b7 100644
--- a/console-tools/setconsole.c
+++ b/console-tools/setconsole.c
@@ -12,8 +12,10 @@
//config: default y
//config: select PLATFORM_LINUX
//config: help
-//config: This program redirects the system console to another device,
+//config: Redirect writes to /dev/console to another device,
//config: like the current tty while logged in via telnet.
+//config: This does not redirect kernel log, only writes
+//config: from user space.
//config:
//config:config FEATURE_SETCONSOLE_LONG_OPTIONS
//config: bool "Enable long options"
@@ -27,8 +29,10 @@
//usage:#define setconsole_trivial_usage
//usage: "[-r] [DEVICE]"
//usage:#define setconsole_full_usage "\n\n"
-//usage: "Redirect system console output to DEVICE (default: /dev/tty)\n"
-//usage: "\n -r Reset output to /dev/console"
+//usage: "Make writes to /dev/console appear on DEVICE (default: /dev/tty)."
+//usage: "\n""Does not redirect kernel log output or reads from /dev/console."
+//usage: "\n"
+//usage: "\n"" -r Reset: writes to /dev/console go to kernel log tty(s)"
/* It was a bbox-specific invention, but SUSE does have a similar utility.
* SUSE has no -r option, though.
@@ -40,7 +44,7 @@
int setconsole_main(int argc UNUSED_PARAM, char **argv)
{
const char *device = CURRENT_TTY;
- bool reset;
+ int reset;
/* at most one non-option argument */
opt_complementary = "?1";
@@ -54,6 +58,9 @@
device = DEV_CONSOLE;
}
+//TODO: fails if TIOCCONS redir is already active to some tty.
+//I think SUSE version first does TIOCCONS on /dev/console fd (iow: resets)
+//then TIOCCONS to new tty?
xioctl(xopen(device, O_WRONLY), TIOCCONS, NULL);
return EXIT_SUCCESS;
}
