#include <string.h>
#include <errno.h>
#include <unistd.h>
+#include <fcntl.h>
#include "log.h"
#include "util.h"
static const char *arg_dest = "/tmp";
static int add_symlink(const char *fservice, const char *tservice) {
- _cleanup_free_ char *from = NULL, *to = NULL;
+ char *from, *to;
int r;
assert(fservice);
assert(tservice);
- from = strappend(SYSTEM_DATA_UNIT_PATH "/", fservice);
- if (!from)
- return log_oom();
-
- to = strjoin(arg_dest,"/getty.target.wants/", tservice, NULL);
- if (!to)
- return log_oom();
+ from = strappenda(SYSTEM_DATA_UNIT_PATH "/", fservice);
+ to = strappenda3(arg_dest, "/getty.target.wants/", tservice);
mkdir_parents_label(to, 0755);
log_debug("Automatically adding serial getty for /dev/%s.", tty);
- n = unit_name_replace_instance("serial-getty@.service", tty);
+ n = unit_name_from_path_instance("serial-getty", tty, ".service");
if (!n)
return log_oom();
log_debug("Automatically adding container getty for /dev/pts/%s.", tty);
- n = unit_name_replace_instance("container-getty@.service", tty);
+ n = unit_name_from_path_instance("container-getty", tty, ".service");
if (!n)
return log_oom();
return add_symlink("container-getty@.service", n);
}
+static int verify_tty(const char *name) {
+ _cleanup_close_ int fd = -1;
+ const char *p;
+
+ /* Some TTYs are weird and have been enumerated but don't work
+ * when you try to use them, such as classic ttyS0 and
+ * friends. Let's check that and open the device and run
+ * isatty() on it. */
+
+ p = strappenda("/dev/", name);
+
+ /* O_NONBLOCK is essential here, to make sure we don't wait
+ * for DCD */
+ fd = open(p, O_RDWR|O_NONBLOCK|O_NOCTTY|O_CLOEXEC|O_NOFOLLOW);
+ if (fd < 0)
+ return -errno;
+
+ errno = 0;
+ if (isatty(fd) <= 0)
+ return errno ? -errno : -EIO;
+
+ return 0;
+}
+
int main(int argc, char *argv[]) {
static const char virtualization_consoles[] =
"hvc0\0"
"xvc0\0"
- "hvsi0\0";
+ "hvsi0\0"
+ "sclp_line0\0"
+ "ttysclp0\0"
+ "3270!tty1\0";
_cleanup_free_ char *active = NULL;
const char *j;
* the variable name we only support ptys here. */
r = getenv_for_pid(1, "container_ttys", &container_ttys);
- if (r >= 0) {
+ if (r > 0) {
char *w, *state;
size_t l;
t = tty;
/* Then, make sure it's actually a pty */
- t = path_startswith(tty, "pts/");
+ t = path_startswith(t, "pts/");
if (!t)
continue;
if (isempty(tty) || tty_is_vc(tty))
continue;
+ if (verify_tty(tty) < 0)
+ continue;
+
/* We assume that gettys on virtual terminals are
* started via manual configuration and do this magic
* only for non-VC terminals. */
/* Automatically add in a serial getty on the first
* virtualizer console */
NULSTR_FOREACH(j, virtualization_consoles) {
- _cleanup_free_ char *p = NULL;
-
- p = strappend("/sys/class/tty/", j);
- if (!p) {
- log_oom();
- return EXIT_FAILURE;
- }
+ char *p;
+ p = strappenda("/sys/class/tty/", j);
if (access(p, F_OK) < 0)
continue;