[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/07: build: container: Setup /dev/console.
From: |
David Thompson |
Subject: |
02/07: build: container: Setup /dev/console. |
Date: |
Wed, 02 Sep 2015 00:04:39 +0000 |
davexunit pushed a commit to branch wip-container
in repository guix.
commit e6a8a9124e6d006f2394ca401ac71cfc3b3ac6f1
Author: David Thompson <address@hidden>
Date: Sat Aug 1 13:54:40 2015 -0400
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 files 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"))
- branch wip-container created (now b66e1ea), David Thompson, 2015/09/01
- 01/07: gnu: guix-devel: Update snapshot and re-enable container tests., David Thompson, 2015/09/01
- 03/07: build: syscalls: Add pseudo-terminal bindings., David Thompson, 2015/09/01
- 04/07: gnu: system: Add Linux container module., David Thompson, 2015/09/01
- 05/07: scripts: system: Add 'container' action., David Thompson, 2015/09/01
- 06/07: scripts: environment: Add --container option., David Thompson, 2015/09/01
- 02/07: build: container: Setup /dev/console.,
David Thompson <=
- 07/07: scripts: Add 'container' subcommand., David Thompson, 2015/09/01