ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

agetty: print /etc/issue on --skip-login 

The current --skip-login implementation disables also issue file
printing. This is unexpected behavior as /etc/issue may contains
important information and we have --noissue for admins who don't want
it.

This patch forces /etc/issue printing if --noissue no specified.

Addresses: https://github.com/karelzak/util-linux/issues/480
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2017-07-10 10:42:49 +02:00
parent 6d53d1f99a
commit a273d83db9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
term-utils/agetty.c
View File

@ -317,6 +317,7 @@ static ssize_t append(char *dest, size_t len, const char *sep, const char *src)
static void check_username (const char* nm);
static void login_options_to_argv(char *argv[], int *argc, char *str, char *username);
static void reload_agettys(void);
static void print_issue_file(struct options *op, struct termios *tp);
/* Fake hostname for ut_host specified on command line. */
static char *fakehost;
@ -452,7 +453,9 @@ int main(int argc, char **argv)
username = options.autolog;
}
if ((options.flags & F_NOPROMPT) == 0) {
if (options.flags & F_NOPROMPT) { /* --skip-login */
print_issue_file(&options, &termios);
} else { /* regular (auto)login */
if (options.autolog) {
/* Autologin prompt */
do_prompt(&options, &termios);