[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#30216] [WIP v4] services: agetty: Make tty optional.
From: |
Danny Milosavljevic |
Subject: |
[bug#30216] [WIP v4] services: agetty: Make tty optional. |
Date: |
Wed, 24 Jan 2018 14:12:19 +0100 |
* gnu/system/install.scm (agetty-default-service): Delete variable.
(embedded-installation-os): Move agetty-service instantiation to...
* gnu/services/base.scm (%base-services): ...here.
(default-tty): New variable.
(agetty-shepherd-service): Make tty optional, default to the above.
---
gnu/services/base.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++---
gnu/system/install.scm | 12 +----------
2 files changed, 53 insertions(+), 14 deletions(-)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 8e30bcd34..90b45920d 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -817,7 +817,7 @@ the message of the day, among other things."
agetty-configuration?
(agetty agetty-configuration-agetty ;<package>
(default util-linux))
- (tty agetty-configuration-tty) ;string
+ (tty agetty-configuration-tty) ;string | #f
(term agetty-term ;string | #f
(default #f))
(baud-rate agetty-baud-rate ;string | #f
@@ -890,6 +890,47 @@ the message of the day, among other things."
;;; (default #f))
)
+(define (default-tty)
+ #~(begin
+ ;; console=device,options
+ ;; device: can be tty0, ttyS0, lp0, ttyUSB0 (serial).
+ ;; options: BBBBPNF. P n|o|e, N number of bits,
+ ;; F flow control (r RTS)
+ (use-modules (rnrs io ports))
+ (let* ((command (call-with-input-file "/proc/cmdline" get-string-all))
+ (not-comma (char-set-complement (char-set #\,)))
+ (items (string-tokenize command))
+ (items-by-key (lambda (key target-prefix)
+ (let ((keylen (string-length key)))
+ (map (lambda (a)
+ (string-append target-prefix
+ (string-drop a keylen)))
+ (filter (lambda (b)
+ (string-prefix? key b)) items)))))
+ (agetty-ttys (items-by-key "agetty.tty=" ""))
+ (console-ttys (filter (lambda (tty)
+ (not (or
+ (string-prefix? tty "tty0")
+ (string-prefix? tty "tty1")
+ (string-prefix? tty "tty2")
+ (string-prefix? tty "tty3")
+ (string-prefix? tty "tty4")
+ (string-prefix? tty "tty5")
+ (string-prefix? tty "tty6")
+ (string-prefix? tty "tty7")
+ (string-prefix? tty "tty8")
+ (string-prefix? tty "tty9"))))
+ (items-by-key "console=tty" "tty")))
+ (ttys (or agetty-ttys (map (lambda (console-spec)
+ ;; Extract device name.
+ (car (string-tokenize console-spec
+ not-comma)))
+ console-ttys))))
+ (if (null? ttys)
+ "XXX" ; crashes entire boot: (error "agetty: 'tty' not specified and
no default tty found.
+;Try specifying 'agetty.tty' or 'console' on the kernel command line.")
+ (car ttys)))))
+
(define agetty-shepherd-service
(match-lambda
(($ <agetty-configuration> agetty tty term baud-rate auto-login
@@ -901,7 +942,7 @@ the message of the day, among other things."
(list
(shepherd-service
(documentation "Run agetty on a tty.")
- (provision (list (symbol-append 'term- (string->symbol tty))))
+ (provision (list (symbol-append 'term- (string->symbol (or tty
"auto")))))
;; Since the login prompt shows the host name, wait for the
'host-name'
;; service to be done. Also wait for udev essentially so that the tty
@@ -946,6 +987,9 @@ the message of the day, among other things."
('always "--local-line=always")
('never "-local-line=never")))
#~())
+ #$@(if tty
+ #~()
+ #~("--keep-baud"))
#$@(if extract-baud?
#~("--extract-baud")
#~())
@@ -1009,7 +1053,7 @@ the message of the day, among other things."
#$@(if login-pause?
#~("--login-pause")
#~())
- #$tty
+ #$(or tty (default-tty))
#$@(if baud-rate
#~(#$baud-rate)
#~())
@@ -2012,6 +2056,11 @@ This service is not part of @var{%base-services}."
(cons tty %default-console-font))
'("tty1" "tty2" "tty3" "tty4" "tty5" "tty6")))
+ (agetty-service (agetty-configuration
+ (extra-options '("-L")) ; no carrier detect
+ (term "vt100")
+ (tty #f))) ; automatic
+
(mingetty-service (mingetty-configuration
(tty "tty1")))
(mingetty-service (mingetty-configuration
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index e4b2e8237..27bc05c95 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -381,14 +381,6 @@ You have been warned. Thanks for being so brave.\x1b[0m
nvi ;:wq!
%base-packages))))
-(define* (agetty-default-service #:optional (tty "ttyS0"))
- "Return an agetty-service on the given TTY"
- (agetty-service (agetty-configuration
- (extra-options '("-L"))
- (baud-rate "115200")
- (term "vt100")
- (tty tty))))
-
(define* (embedded-installation-os bootloader bootloader-target tty
#:key (extra-modules '()))
"Return an installation os for embedded systems.
@@ -404,9 +396,7 @@ The bootloader BOOTLOADER is installed to
BOOTLOADER-TARGET."
(initrd (lambda (fs . rest)
(apply base-initrd fs
#:extra-modules extra-modules
- rest)))
- (services (cons* (agetty-default-service tty)
- (operating-system-user-services installation-os)))))
+ rest)))))
(define beaglebone-black-installation-os
(embedded-installation-os u-boot-beaglebone-black-bootloader
- [bug#30216] [FIXME] system: Add ARM installer., Danny Milosavljevic, 2018/01/22
- [bug#30216] [WIP] services: agetty: Make tty optional., Danny Milosavljevic, 2018/01/22
- [bug#30216] [WIP v2] services: agetty: Make tty optional., Danny Milosavljevic, 2018/01/23
- [bug#30216] [WIP v3] services: agetty: Make tty optional., Danny Milosavljevic, 2018/01/23
- [bug#30216] [WIP v4] services: agetty: Make tty optional.,
Danny Milosavljevic <=
- [bug#30216] [WIP v5] services: agetty: Make tty optional., Danny Milosavljevic, 2018/01/24
- [bug#30216] [WIP v5] services: agetty: Make tty optional., Ludovic Courtès, 2018/01/30
- [bug#30216] [WIP v5] services: agetty: Make tty optional., Danny Milosavljevic, 2018/01/30
- [bug#30216] [WIP v5] services: agetty: Make tty optional., Danny Milosavljevic, 2018/01/30
- [bug#30216] [WIP v5] services: agetty: Make tty optional., Ludovic Courtès, 2018/01/31
[bug#30216] [FIXME] system: Add ARM installer., Ludovic Courtès, 2018/01/23