diff options
| author | Sami Kerola | 2017-04-01 12:38:01 +0200 |
|---|---|---|
| committer | Sami Kerola | 2017-04-03 20:55:15 +0200 |
| commit | 343cc275591327bc2094f88387f09702a542dc8c (patch) | |
| tree | 1379ed4cc0982e09bd9d0cec3f1873dcd16f5379 /term-utils | |
| parent | lib/cpuset: stop changing variable that is not read (diff) | |
| download | kernel-qcow2-util-linux-343cc275591327bc2094f88387f09702a542dc8c.tar.gz kernel-qcow2-util-linux-343cc275591327bc2094f88387f09702a542dc8c.tar.xz kernel-qcow2-util-linux-343cc275591327bc2094f88387f09702a542dc8c.zip | |
agetty: make --remote to forward --nohostname as -H to login
Without this change an attempt to remove hostname printing required following
rather clumsy agetty invocation.
/sbin/agetty --nohostname --login-options '/bin/login -H -- \u'
After the change --nohostname behaves similar way with --host option, that
is when combined with --remote the effect is passed to login(1).
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'term-utils')
| -rw-r--r-- | term-utils/agetty.8 | 8 | ||||
| -rw-r--r-- | term-utils/agetty.c | 9 |
2 files changed, 12 insertions, 5 deletions
diff --git a/term-utils/agetty.8 b/term-utils/agetty.8 index 40be8b46c..4431341c2 100644 --- a/term-utils/agetty.8 +++ b/term-utils/agetty.8 @@ -100,8 +100,12 @@ Don't reset terminal cflags (control modes). See \fBtermios\fP(3) for more details. .TP \-E, \-\-remote -If an \fB\-H\fP \fIfakehost\fP option is given, then an \fB\-r\fP -\fIfakehost\fP option is added to the \fB/bin/login\fP command line. +If an \fB\-\-host\fP \fIfakehost\fP option is given, then an \fB\-h\fP +\fIfakehost\fP option and argument are added to the \fB/bin/login\fP +command line. +.IP +If an \fB\-\-nohostname\fR option is given, then an \fB\-H\fP option +is added to the \fB/bin/login\fP command line. .TP \-f, \-\-issue\-file \fIissue_file\fP Display the contents of \fIissue_file\fP instead of \fI/etc/issue\fP. diff --git a/term-utils/agetty.c b/term-utils/agetty.c index 6a2085a3c..93a3843c7 100644 --- a/term-utils/agetty.c +++ b/term-utils/agetty.c @@ -493,9 +493,12 @@ int main(int argc, char **argv) login_options_to_argv(login_argv, &login_argc, options.logopt, username); } else { - if (fakehost && (options.flags & F_REMOTE)) { - login_argv[login_argc++] = "-h"; - login_argv[login_argc++] = fakehost; + if (options.flags & F_REMOTE) { + if (fakehost) { + login_argv[login_argc++] = "-h"; + login_argv[login_argc++] = fakehost; + } else if (options.flags & F_NOHOSTNAME) + login_argv[login_argc++] = "-H"; } if (username) { if (options.autolog) |