[PATCH] build: container: Setup /dev/console.

[PATCH] build: container: Setup /dev/console.

[David Thompson]

[-- Attachment #1: Type: text/plain, Size: 63 bytes --]

A step towards making containers behave better WRT terminals.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-build-container-Setup-dev-console.patch --]
[-- Type: text/x-patch, Size: 1955 bytes --]

From dc797eb8e306655b10bd466d64ef5deaf428259f Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Sat, 1 Aug 2015 13:54:40 -0400
Subject: [PATCH] build: container: Setup /dev/console.

* gnu/build/linux-container.scm (mount-file-systems): Bind mount the
  controlling terminal as /dev/console.
---
 gnu/build/linux-container.scm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/gnu/build/linux-container.scm b/gnu/build/linux-container.scm
index af59904..4262748 100644
--- a/gnu/build/linux-container.scm
+++ b/gnu/build/linux-container.scm
@@ -55,6 +55,9 @@ to ROOT, then make ROOT the new root directory for the process."
   (define (scope dir)
     (string-append root dir))
 
+  (define (touch file-name)
+    (call-with-output-file file-name (const #t)))
+
   (define (bind-mount src dest)
     (mount src dest "none" MS_BIND))
 
@@ -89,8 +92,7 @@ to ROOT, then make ROOT the new root directory for the process."
   (for-each (lambda (device)
               (when (file-exists? device)
                 ;; Create the mount point file.
-                (call-with-output-file (scope device)
-                  (const #t))
+                (touch (scope device))
                 (bind-mount device (scope device))))
             '("/dev/null"
               "/dev/zero"
@@ -101,6 +103,15 @@ to ROOT, then make ROOT the new root directory for the process."
               "/dev/ptmx"
               "/dev/fuse"))
 
+  ;; Setup the container's /dev/console by bind mounting the psuedo-terminal
+  ;; associated with standard input.
+  (let ((in      (current-input-port))
+        (console (scope "/dev/console")))
+    (when (isatty? in)
+      (touch console)
+      (chmod console #o600)
+      (bind-mount (ttyname in) console)))
+
   ;; Setup standard input/output/error.
   (symlink "/proc/self/fd"   (scope "/dev/fd"))
   (symlink "/proc/self/fd/0" (scope "/dev/stdin"))
-- 
2.5.0


[-- Attachment #3: Type: text/plain, Size: 38 bytes --]


-- 
David Thompson
GPG Key: 0FF1D807

Re: [PATCH] build: container: Setup /dev/console.

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> From dc797eb8e306655b10bd466d64ef5deaf428259f Mon Sep 17 00:00:00 2001
> From: David Thompson <dthompson2@worcester.edu>
> Date: Sat, 1 Aug 2015 13:54:40 -0400
> Subject: [PATCH] build: container: Setup /dev/console.
>
> * gnu/build/linux-container.scm (mount-file-systems): Bind mount the
>   controlling terminal as /dev/console.

[...]

> +  ;; Setup the container's /dev/console by bind mounting the psuedo-terminal
                                                                 ^^^
Typo.

Otherwise LGTM, thanks!

Ludo’.

Re: [PATCH] build: container: Setup /dev/console.

[Thompson, David]

On Mon, Sep 7, 2015 at 12:03 PM, Ludovic Courtès <ludo@gnu.org> wrote:
> David Thompson <dthompson2@worcester.edu> skribis:
>
>> From dc797eb8e306655b10bd466d64ef5deaf428259f Mon Sep 17 00:00:00 2001
>> From: David Thompson <dthompson2@worcester.edu>
>> Date: Sat, 1 Aug 2015 13:54:40 -0400
>> Subject: [PATCH] build: container: Setup /dev/console.
>>
>> * gnu/build/linux-container.scm (mount-file-systems): Bind mount the
>>   controlling terminal as /dev/console.
>
> [...]
>
>> +  ;; Setup the container's /dev/console by bind mounting the psuedo-terminal
>                                                                  ^^^
> Typo.

Thanks.  I have a bad tendency to transpose those characters.

> Otherwise LGTM, thanks!

Fixed and pushed.

- Dave