diff options
author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2014-01-20 18:15:06 +0000 |
---|---|---|
committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2014-01-20 18:15:06 +0000 |
commit | 875e23de1fa47e9bee345d3bfe18237970db0b83 (patch) | |
tree | 4e3148296da1dfbb27b5f98e69f14f2485a72627 | |
parent | 094f2691cab2836b1d441da0c8e114c402630dc1 (diff) | |
download | FreeBSD-src-875e23de1fa47e9bee345d3bfe18237970db0b83.zip FreeBSD-src-875e23de1fa47e9bee345d3bfe18237970db0b83.tar.gz |
Add a new flag to /etc/ttys: onifconsole. This is equivalent to "on" if the
device is an active kernel console and "off" otherwise. This is designed to
allow serial-booting x86 systems to provide a login prompt on the serial line
by default without providing one on all systems by default.
Comments and suggestions by: grehan, dteske, jilles
MFC after: 1 month
-rw-r--r-- | include/ttyent.h | 1 | ||||
-rw-r--r-- | lib/libc/gen/getttyent.c | 35 | ||||
-rw-r--r-- | libexec/getty/ttys.5 | 7 |
3 files changed, 41 insertions, 2 deletions
diff --git a/include/ttyent.h b/include/ttyent.h index 815d168..f2220ad 100644 --- a/include/ttyent.h +++ b/include/ttyent.h @@ -37,6 +37,7 @@ #define _TTYS_OFF "off" #define _TTYS_ON "on" +#define _TTYS_ONIFCONSOLE "onifconsole" #define _TTYS_SECURE "secure" #define _TTYS_INSECURE "insecure" #define _TTYS_WINDOW "window" diff --git a/lib/libc/gen/getttyent.c b/lib/libc/gen/getttyent.c index b82c30a..d104305 100644 --- a/lib/libc/gen/getttyent.c +++ b/lib/libc/gen/getttyent.c @@ -39,6 +39,9 @@ __FBSDID("$FreeBSD$"); #include <ctype.h> #include <string.h> +#include <sys/types.h> +#include <sys/sysctl.h> + static char zapchar; static FILE *tf; static size_t lbsize; @@ -64,6 +67,36 @@ getttynam(const char *tty) return (t); } +static int +auto_tty_status(const char *ty_name) +{ + size_t len; + char *buf, *cons, *nextcons; + + /* Check if this is an enabled kernel console line */ + buf = NULL; + if (sysctlbyname("kern.console", NULL, &len, NULL, 0) == -1) + return (0); /* Errors mean don't enable */ + buf = malloc(len); + if (sysctlbyname("kern.console", buf, &len, NULL, 0) == -1) + goto done; + + if ((cons = strchr(buf, '/')) == NULL) + goto done; + *cons = '\0'; + nextcons = buf; + while ((cons = strsep(&nextcons, ",")) != NULL && strlen(cons) != 0) { + if (strcmp(cons, ty_name) == 0) { + free(buf); + return (TTY_ON); + } + } + +done: + free(buf); + return (0); +} + struct ttyent * getttyent(void) { @@ -126,6 +159,8 @@ getttyent(void) tty.ty_status &= ~TTY_ON; else if (scmp(_TTYS_ON)) tty.ty_status |= TTY_ON; + else if (scmp(_TTYS_ONIFCONSOLE)) + tty.ty_status |= auto_tty_status(tty.ty_name); else if (scmp(_TTYS_SECURE)) tty.ty_status |= TTY_SECURE; else if (scmp(_TTYS_INSECURE)) diff --git a/libexec/getty/ttys.5 b/libexec/getty/ttys.5 index 18151c9..71a4b2b 100644 --- a/libexec/getty/ttys.5 +++ b/libexec/getty/ttys.5 @@ -102,8 +102,11 @@ ttys as a group. .Pp As flag values, the strings ``on'' and ``off'' specify that .Xr init 8 -should (should not) execute the command given in the second field, -while ``secure'' (if ``on'' is also specified) allows users with a +should (should not) execute the command given in the second field. +``onifconsole'' will cause this line to be enabled if and only if it is +an active kernel console device (it is equivalent to ``on'' in this +case). +The flag ``secure'' (if the console is enabled) allows users with a uid of 0 to login on this line. The flag ``dialin'' indicates that a tty entry describes a dialin |