Improve the default command for entering a container.

[micoforia.git] / micoforia.c

diff --git a/micoforia.c b/micoforia.c
index 6e10a0c8aab3ef96d9710e69100f0b47d965319e..699354202debf3ab1ac640cdd3cb3e6bfd90fb19 100644 (file)
--- a/micoforia.c
+++ b/micoforia.c
@@ -1922,13 +1922,17 @@ static bool com_enter(void)
        char **argv;
        char *nsenter_args[] = {"nsenter", "-w", "-a", "-r", "-t"};
        const unsigned nna = ARRAY_SIZE(nsenter_args); /* num nsenter args */
-       char *dflt_cmd[] = {"login", "-f", "root"};
+       char *dflt_cmd[] = {"bash", "-c", "[[ -f /etc/os-release ]] && "
+               ". /etc/os-release && printf '%s\n' \"$PRETTY_NAME\"; "
+               "command cd; exec bash"};
        unsigned n, N, ni = lls_num_inputs(sublpr);
        unsigned nea = ni > 1? ni - 1 : ARRAY_SIZE(dflt_cmd); /* num extra args */
        const char *arg;
        bool success;
        int ret, pid;
        char *errctx;
+       struct termios tios;
+       bool tty;
 
        ret = lls_check_arg_count(sublpr, 1, INT_MAX, &errctx);
        if (ret < 0)
@@ -1951,7 +1955,21 @@ static bool com_enter(void)
                        : dflt_cmd[n];
        argv[N - 1] = NULL;
        clean_env();
+       tty = false;
+       if (isatty(STDIN_FILENO) && isatty(STDOUT_FILENO)) {
+               if (tcgetattr(STDIN_FILENO, &tios) >= 0)
+                       tty = true;
+       }
        success = xexec(argv, NULL);
+       if (tty) { /* reset terminal settings */
+               /*
+                * First give up the controlling terminal. Without this, the
+                * command gets SIGSTOP and goes to the background. We ignore
+                * errors here because nobody cares about a messed up terminal.
+                */
+               ioctl(STDIN_FILENO, TIOCNOTTY);
+               tcsetattr(STDIN_FILENO, TCSAFLUSH, &tios);
+       }
        free(argv);
        return success;
 }