nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

system: Factor out agetty-default-service. 

* gnu/system/install.scm (agetty-default-service): New variable.
(beaglebone-black-installation-os): Use it.
(a20-olinuxino-lime2-emmc-installation-os): Use it.
(a20-olinuxino-micro-installation-os): Use it.
(banana-pi-m2-ultra-installation-os): Use it.
master
Danny Milosavljevic 2018-01-20 21:01:58 +01:00
parent a7bb327e3c
commit 8bac66deab
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gnu/system/install.scm
View File

@ -379,6 +379,14 @@ You have been warned. Thanks for being so brave.\x1b[0m
nvi ;:wq! nvi ;:wq!
%base-packages)))) %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 beaglebone-black-installation-os (define beaglebone-black-installation-os
(operating-system (operating-system
(inherit installation-os) (inherit installation-os)
@ -391,16 +399,8 @@ You have been warned. Thanks for being so brave.\x1b[0m
;; This module is required to mount the sd card. ;; This module is required to mount the sd card.
#:extra-modules (list "omap_hsmmc") #:extra-modules (list "omap_hsmmc")
rest))) rest)))
(services (append (services (cons* (agetty-default-service "ttyO0")
;; mingetty does not work on serial lines. (operating-system-user-services installation-os)))))
;; Use agetty with board-specific serial parameters.
(list (agetty-service
(agetty-configuration
(extra-options '("-L"))
(baud-rate "115200")
(term "vt100")
(tty "ttyO0"))))
(operating-system-user-services installation-os)))))
(define a20-olinuxino-lime2-emmc-installation-os (define a20-olinuxino-lime2-emmc-installation-os
(operating-system (operating-system
@ -409,14 +409,8 @@ You have been warned. Thanks for being so brave.\x1b[0m
(bootloader u-boot-a20-olinuxino-lime2-bootloader) (bootloader u-boot-a20-olinuxino-lime2-bootloader)
(target "/dev/mmcblk1"))) ; eMMC storage (target "/dev/mmcblk1"))) ; eMMC storage
(kernel linux-libre) (kernel linux-libre)
(services (append (services (cons* (agetty-default-service "ttyS0")
(list (agetty-service (operating-system-user-services installation-os)))))
(agetty-configuration
(extra-options '("-L"))
(baud-rate "115200")
(term "vt100")
(tty "ttyS0"))))
(operating-system-user-services installation-os)))))
(define a20-olinuxino-micro-installation-os (define a20-olinuxino-micro-installation-os
(operating-system (operating-system
@ -425,14 +419,8 @@ You have been warned. Thanks for being so brave.\x1b[0m
(bootloader u-boot-a20-olinuxino-lime2-bootloader) (bootloader u-boot-a20-olinuxino-lime2-bootloader)
(target "/dev/mmcblk0"))) ; SD card storage (target "/dev/mmcblk0"))) ; SD card storage
(kernel linux-libre) (kernel linux-libre)
(services (append (services (cons* (agetty-default-service "ttyS0")
(list (agetty-service (operating-system-user-services installation-os)))))
(agetty-configuration
(extra-options '("-L"))
(baud-rate "115200")
(term "vt100")
(tty "ttyS0"))))
(operating-system-user-services installation-os)))))
(define banana-pi-m2-ultra-installation-os (define banana-pi-m2-ultra-installation-os
(operating-system (operating-system
@ -441,14 +429,8 @@ You have been warned. Thanks for being so brave.\x1b[0m
(bootloader u-boot-banana-pi-m2-ultra-bootloader) (bootloader u-boot-banana-pi-m2-ultra-bootloader)
(target "/dev/mmcblk1"))) ; eMMC storage (target "/dev/mmcblk1"))) ; eMMC storage
(kernel linux-libre) (kernel linux-libre)
(services (append (services (cons* (agetty-default-service "ttyS0")
(list (agetty-service (operating-system-user-services installation-os)))))
(agetty-configuration
(extra-options '("-L"))
(baud-rate "115200")
(term "vt100")
(tty "ttyS0"))))
(operating-system-user-services installation-os)))))
;; Return the default os here so 'guix system' can consume it directly. ;; Return the default os here so 'guix system' can consume it directly.
installation-os installation-os