summaryrefslogtreecommitdiffstats
path: root/term-utils
diff options
context:
space:
mode:
authorKarel Zak2012-11-22 11:23:53 +0100
committerKarel Zak2012-11-22 11:23:53 +0100
commit5676f36563cb1e7d46067631f08bc1456bbf6736 (patch)
treece63cbbf12f69f7050050effe5025c50b0e3c404 /term-utils
parentagetty: add --{erase,kill}-chars options (diff)
downloadkernel-qcow2-util-linux-5676f36563cb1e7d46067631f08bc1456bbf6736.tar.gz
kernel-qcow2-util-linux-5676f36563cb1e7d46067631f08bc1456bbf6736.tar.xz
kernel-qcow2-util-linux-5676f36563cb1e7d46067631f08bc1456bbf6736.zip
agetty: remove @ and # as default kill and erase chars
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'term-utils')
-rw-r--r--term-utils/agetty.812
-rw-r--r--term-utils/agetty.c4
2 files changed, 8 insertions, 8 deletions
diff --git a/term-utils/agetty.8 b/term-utils/agetty.8
index 2110cae5c..9cc611b03 100644
--- a/term-utils/agetty.8
+++ b/term-utils/agetty.8
@@ -27,7 +27,7 @@ Adapts the tty settings to parity bits and to erase, kill,
end-of-line and uppercase characters when it reads a login name.
The program can handle 7-bit characters with even, odd, none or space
parity, and 8-bit characters with no parity. The following special
-characters are recognized: @ and Control-U (kill); #, DEL and
+characters are recognized: Control-U (kill); DEL and
back space (erase); carriage return and line feed (end of line).
See also \fB\-\-erase-chars\fP and \fB\-\-kill-chars\fP options.
.IP o
@@ -220,13 +220,15 @@ or if not found by getaddrinfo() is shown.
.TP
\-\-erase\-chars \fIstring\fP
This option specifies additional chars that should be interpreted as a
-backspace (ignore previous char) when user specifies login name. The default is
-\'#\', specify empty string to disable the default.
+backspace (ignore previous char) when user specifies login name. The original
+default has been \'#\', since util-linux 2.23 no additional erase chars are
+enabled by default.
.TP
\-\-kill\-chars \fIstring\fP
This option specifies additional chars that should be interpreted as a
-kill (ignore all previous chars) when user specifies login name.
-The default is \'@\', specify empty string to disable the default.
+kill (ignore all previous chars) when user specifies login name. The original
+default has been \'@\', since util-linux 2.23 no additional erase chars are
+enabled by default.
.TP
\-\-version
Output version information and exit.
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index c63dd3fde..5df150a3e 100644
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -285,9 +285,7 @@ int main(int argc, char **argv)
.flags = F_ISSUE, /* show /etc/issue (SYSV_STYLE) */
.login = _PATH_LOGIN, /* default login program */
.tty = "tty1", /* default tty line */
- .issue = ISSUE, /* default issue file */
- .erasechars = "#", /* default additional erase char */
- .killchars = "@" /* default additional kill char */
+ .issue = ISSUE /* default issue file */
};
char *login_argv[LOGIN_ARGV_MAX + 1];
int login_argc = 0;