diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-02-16 13:14:26 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-02-16 13:14:26 -0500 |
| commit | 150062f19060687dbf8e2cbe6a22c2f8600e7c4e (patch) | |
| tree | 4c25afac34832d118407180d66121f1a2f0c761d /gnu/system | |
| parent | 54a93355c22ab533743cd948cf7b57993c789686 (diff) | |
| parent | 6a3cf4e6c7d77634d67902215f0017c12455c6fb (diff) | |
| download | gnu-guix-150062f19060687dbf8e2cbe6a22c2f8600e7c4e.tar gnu-guix-150062f19060687dbf8e2cbe6a22c2f8600e7c4e.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/install.scm | 15 |
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 |