aboutsummaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2018-02-09 17:07:25 +0100
committerDanny Milosavljevic <dannym@scratchpost.org>2018-02-15 12:05:21 +0100
commit5a9902c8acd63916c6c80cf3c61be6ee814b7e3d (patch)
treed0e7e766167f085cb2af3c544a8f309616ff2f61 /gnu/system
parent2b870303e70d6f3cbe4ee156b1d454b44cd2709a (diff)
downloadguix-5a9902c8acd63916c6c80cf3c61be6ee814b7e3d.tar
guix-5a9902c8acd63916c6c80cf3c61be6ee814b7e3d.tar.gz
services: agetty: Add agetty instance to base services. Make its tty optional.
* gnu/services/base.scm (%base-services): Instantiate agetty-service. (default-serial-port): New variable. (agetty-shepherd-service): Make tty optional, default to the above. * doc/guix.texi (agetty-configuration): Update "tty" documentation. * gnu/system/install.scm (agetty-default-service): Delete variable. (embedded-installation-os): Remove agetty-default-service instance. Add "console" kernel-argument.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/install.scm15
1 files changed, 4 insertions, 11 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index e4b2e82378..b61660b4b9 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.
@@ -401,12 +393,13 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET."
(bootloader bootloader)
(target bootloader-target)))
(kernel linux-libre)
+ (kernel-arguments
+ (cons (string-append "console=" tty)
+ (operating-system-user-kernel-arguments installation-os)))
(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