From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edzrs-00073t-2a for guix-patches@gnu.org; Tue, 23 Jan 2018 09:48:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edzrm-00024P-7W for guix-patches@gnu.org; Tue, 23 Jan 2018 09:48:08 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:59581) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edzrm-00023w-3k for guix-patches@gnu.org; Tue, 23 Jan 2018 09:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1edzrl-00075R-TP for guix-patches@gnu.org; Tue, 23 Jan 2018 09:48:01 -0500 Subject: [bug#30216] [WIP v3] services: agetty: Make tty optional. Resent-Message-ID: From: Danny Milosavljevic Date: Tue, 23 Jan 2018 15:40:22 +0100 Message-Id: <20180123144022.31285-1-dannym@scratchpost.org> In-Reply-To: <20180123143409.31064-1-dannym@scratchpost.org> References: <20180123143409.31064-1-dannym@scratchpost.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30216@debbugs.gnu.org * gnu/services/base.scm (default-tty): New variable. (agetty-shepherd-service): Make tty optional, default to the above. * gnu/system/install.scm (arm-installation-os): New variable. Use the above. --- gnu/services/base.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- gnu/system/install.scm | 8 +++++++- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 8e30bcd34..45b057eb8 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 ; (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,46 @@ 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 (ice-9 textual-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" + (car ttys))))) + (define agetty-shepherd-service (match-lambda (($ agetty tty term baud-rate auto-login @@ -901,7 +941,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 +986,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 +1052,7 @@ the message of the day, among other things." #$@(if login-pause? #~("--login-pause") #~()) - #$tty + #$(or tty (default-tty)) #$@(if baud-rate #~(#$baud-rate) #~()) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index e4b2e8237..cde30ec3b 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -47,6 +47,7 @@ a20-olinuxino-lime-installation-os a20-olinuxino-lime2-emmc-installation-os a20-olinuxino-micro-installation-os + arm-installation-os banana-pi-m2-ultra-installation-os beaglebone-black-installation-os nintendo-nes-classic-edition-installation-os)) @@ -381,7 +382,7 @@ You have been warned. Thanks for being so brave.\x1b[0m nvi ;:wq! %base-packages)))) -(define* (agetty-default-service #:optional (tty "ttyS0")) +(define* (agetty-default-service #:optional (tty #f)) "Return an agetty-service on the given TTY" (agetty-service (agetty-configuration (extra-options '("-L")) @@ -408,6 +409,11 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET." (services (cons* (agetty-default-service tty) (operating-system-user-services installation-os))))) +(define arm-installation-os + (embedded-installation-os u-boot-bootloader + "/dev/null" + #f)) + (define beaglebone-black-installation-os (embedded-installation-os u-boot-beaglebone-black-bootloader "/dev/sda"