forked from pool/util-linux
154 lines
4.3 KiB
Diff
154 lines
4.3 KiB
Diff
Even with TTYReset=no it seems with systemd or plymouth the termios
|
|
flags become changed from under the first agetty on a serial system
|
|
console as the flags are locked.
|
|
|
|
---
|
|
agetty.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
|
|
1 file changed, 68 insertions(+), 7 deletions(-)
|
|
|
|
--- term-utils/agetty.c
|
|
+++ term-utils/agetty.c 2014-03-05 17:52:32.574235616 +0000
|
|
@@ -20,6 +20,7 @@
|
|
#include <sys/ioctl.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
+#include <sys/wait.h>
|
|
#include <fcntl.h>
|
|
#include <stdarg.h>
|
|
#include <ctype.h>
|
|
@@ -276,13 +277,15 @@ static void log_warn (const char *, ...)
|
|
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 int plymouth_command(const char* arg);
|
|
|
|
/* Fake hostname for ut_host specified on command line. */
|
|
static char *fakehost;
|
|
|
|
#ifdef DEBUGGING
|
|
+# include "closestream.h"
|
|
# ifndef DEBUG_OUTPUT
|
|
-# define DEBUG_OUTPUT "/dev/ttyp0"
|
|
+# define DEBUG_OUTPUT "/dev/tty10"
|
|
# endif
|
|
# define debug(s) do { fprintf(dbf,s); fflush(dbf); } while (0)
|
|
FILE *dbf;
|
|
@@ -320,8 +323,12 @@ int main(int argc, char **argv)
|
|
|
|
#ifdef DEBUGGING
|
|
dbf = fopen(DEBUG_OUTPUT, "w");
|
|
- for (int i = 1; i < argc; i++)
|
|
+ for (int i = 1; i < argc; i++) {
|
|
+ if (i > 1)
|
|
+ debug(" ");
|
|
debug(argv[i]);
|
|
+ }
|
|
+ debug("\n");
|
|
#endif /* DEBUGGING */
|
|
|
|
/* Parse command-line arguments. */
|
|
@@ -473,7 +480,6 @@ int main(int argc, char **argv)
|
|
if (options.osrelease)
|
|
free(options.osrelease);
|
|
#ifdef DEBUGGING
|
|
- fprintf(dbf, "read %c\n", ch);
|
|
if (close_stream(dbf) != 0)
|
|
log_err("write failed: %s", DEBUG_OUTPUT);
|
|
#endif
|
|
@@ -1104,6 +1110,27 @@ static void termio_init(struct options *
|
|
{
|
|
speed_t ispeed, ospeed;
|
|
struct winsize ws;
|
|
+ struct termios lock;
|
|
+ int i = (plymouth_command("--ping") == 0) ? 30 : 0;
|
|
+
|
|
+ while (i-- > 0) {
|
|
+ /*
|
|
+ * Even with TTYReset=no it seems with systemd or plymouth
|
|
+ * the termios flags become changed from under the first
|
|
+ * agetty on a serial system console as the flags are locked.
|
|
+ */
|
|
+ memset(&lock, 0, sizeof(struct termios));
|
|
+ if (ioctl(STDIN_FILENO, TIOCGLCKTRMIOS, &lock) < 0)
|
|
+ break;
|
|
+ if (!lock.c_iflag && !lock.c_oflag && !lock.c_cflag && !lock.c_lflag)
|
|
+ break;
|
|
+ debug("termios locked\n");
|
|
+ if (i == 15 && plymouth_command("quit") != 0)
|
|
+ break;
|
|
+ sleep(1);
|
|
+ }
|
|
+ memset(&lock, 0, sizeof(struct termios));
|
|
+ ioctl(STDIN_FILENO, TIOCSLCKTRMIOS, &lock);
|
|
|
|
if (op->flags & F_VCONSOLE) {
|
|
#if defined(IUTF8) && defined(KDGKBMODE)
|
|
@@ -1168,9 +1195,6 @@ static void termio_init(struct options *
|
|
* later on.
|
|
*/
|
|
|
|
- /* Flush input and output queues, important for modems! */
|
|
- tcflush(STDIN_FILENO, TCIOFLUSH);
|
|
-
|
|
#ifdef IUTF8
|
|
tp->c_iflag = tp->c_iflag & IUTF8;
|
|
if (tp->c_iflag & IUTF8)
|
|
@@ -1230,8 +1254,11 @@ static void termio_init(struct options *
|
|
if (op->flags & F_RTSCTS)
|
|
tp->c_cflag |= CRTSCTS;
|
|
#endif
|
|
+ /* Flush input and output queues, important for modems! */
|
|
+ tcflush(STDIN_FILENO, TCIOFLUSH);
|
|
|
|
- tcsetattr(STDIN_FILENO, TCSANOW, tp);
|
|
+ if (tcsetattr(STDIN_FILENO, TCSANOW, tp))
|
|
+ log_warn(_("setting terminal attributes failed: %m"));
|
|
|
|
/* Go to blocking input even in local mode. */
|
|
fcntl(STDIN_FILENO, F_SETFL,
|
|
@@ -1252,6 +1279,10 @@ static void reset_vc(const struct option
|
|
|
|
if (tcsetattr(STDIN_FILENO, TCSADRAIN, tp))
|
|
log_warn(_("setting terminal attributes failed: %m"));
|
|
+
|
|
+ /* Go to blocking input even in local mode. */
|
|
+ fcntl(STDIN_FILENO, F_SETFL,
|
|
+ fcntl(STDIN_FILENO, F_GETFL, 0) & ~O_NONBLOCK);
|
|
}
|
|
|
|
/* Extract baud rate from modem status message. */
|
|
@@ -2273,3 +2304,33 @@ err:
|
|
log_err(_("checkname failed: %m"));
|
|
}
|
|
|
|
+/*
|
|
+ * For the case plymouth is found on this system
|
|
+ */
|
|
+static int plymouth_command(const char* arg)
|
|
+{
|
|
+ const char *cmd = "/usr/bin/plymouth";
|
|
+ static int has_plymouth = 1;
|
|
+ pid_t pid;
|
|
+
|
|
+ if (!has_plymouth)
|
|
+ return 127;
|
|
+
|
|
+ pid = fork();
|
|
+ if (!pid) {
|
|
+ int fd = open("/dev/null", O_RDWR);
|
|
+ dup2(fd, 0);
|
|
+ dup2(fd, 1);
|
|
+ dup2(fd, 2);
|
|
+ close(fd);
|
|
+ execl(cmd, cmd, arg, (char *) NULL);
|
|
+ exit(127);
|
|
+ } else if (pid > 0) {
|
|
+ int status;
|
|
+ waitpid(pid, &status, 0);
|
|
+ if (status == 127)
|
|
+ has_plymouth = 0;
|
|
+ return status;
|
|
+ }
|
|
+ return 1;
|
|
+}
|