From 162a13740041f907f0ce5c2aa05b52b162b4e81a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 19 Jan 2018 16:25:13 +0100 Subject: gnu: Consistently Write ‘file system(s)’. It is the GNU way. * doc/guix.texi (Build Systems, DNS Services): Write ‘file system(s)’. * gnu/build/vm.scm (create-ext-file-system, create-fat-file-system): Likewise. * gnu/packages/backup.scm (dirvish, rsnapshot)[description]: Likewise. * gnu/packages/check.scm (python-testpath)[description]: Likewise. * gnu/packages/disk.scm (pydf)[description]: Likewise. * gnu/packages/file-systems.scm (disorderfs)[synopsis, description]: Likewise. (glusterfs)[description]: Likewise. * gnu/packages/haskell.scm (ghc-directory, ghc-system-fileio-bootstrap) (ghc-system-fileio)[synopsis]: Likewise. (ghc-fsnotify)[description]: Likewise. * gnu/packages/linux.scm (proot)[description]: Likewise. (jmtpfs)[synopsis, description]: Likewise. * gnu/packages/mate.scm (caja, caja-extensions)[description]: Likewise. * gnu/packages/storage.scm (ceph)[description]: Likewise. * gnu/packages/sync.scm (lsyncd)[description]: Likewise. * gnu/packages/syncthing.scm (syncthing)[synopsis]: Likewise. (go-github-com-zillode-notify)[description]: Likewise. * gnu/services/nfs.scm (pipefs-service-type): Likewise. * guix/scripts/system.scm (perform-action): Likewise. --- gnu/system/vm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/system') diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 496f2ac4e..345cecedd 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -346,7 +346,7 @@ the image." (label "GNU-ESP") ;cosmetic only ;; Use "vfat" here since this property is used ;; when mounting. The actual FAT-ness is based - ;; on filesystem size (16 in this case). + ;; on file system size (16 in this case). (file-system "vfat") (flags '(esp)))))))) (initialize-hard-disk "/dev/vda" -- cgit v1.3 From 30aeb846d7516d534aebeee76be4a920195e8d50 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 19 Jan 2018 00:25:13 +0100 Subject: system: Add Banana Pi M2 Ultra installer. * gnu/bootloader/u-boot.scm (u-boot-banana-pi-m2-ultra-bootloader): New exported variable. (install-allwinner-u-boot): New variable. (u-boot-allwinner-bootloader): New variable. * gnu/packages/bootloaders.scm (u-boot-banana-pi-m2-ultra): New exported variable. * gnu/system/install.scm (banana-pi-m2-ultra-installation-os): New exported variable. --- gnu/bootloader/u-boot.scm | 18 ++++++++++++++++++ gnu/packages/bootloaders.scm | 3 +++ gnu/system/install.scm | 17 +++++++++++++++++ 3 files changed, 38 insertions(+) (limited to 'gnu/system') diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 397eb8181..1e3178adf 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -28,6 +28,7 @@ #:use-module (guix records) #:use-module (guix utils) #:export (u-boot-bootloader + u-boot-banana-pi-m2-ultra-bootloader u-boot-beaglebone-black-bootloader)) (define install-u-boot @@ -50,6 +51,13 @@ (write-file-on-device u-boot (* 1024 512) device (* 768 512))))) +(define install-allwinner-u-boot + #~(lambda (bootloader device mount-point) + (let ((u-boot (string-append bootloader + "/libexec/u-boot-sunxi-with-spl.bin"))) + (write-file-on-device u-boot (stat:size (stat u-boot)) + device (* 8 1024))))) + ;;; @@ -68,3 +76,13 @@ (inherit u-boot-bootloader) (package u-boot-beagle-bone-black) (installer install-beaglebone-black-u-boot))) + +(define u-boot-allwinner-bootloader + (bootloader + (inherit u-boot-bootloader) + (installer install-allwinner-u-boot))) + +(define u-boot-banana-pi-m2-ultra-bootloader + (bootloader + (inherit u-boot-allwinner-bootloader) + (package u-boot-banana-pi-m2-ultra))) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 79a3c5f8b..50e55d7d0 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -423,6 +423,9 @@ also initializes the boards (RAM etc).") (define-public u-boot-odroid-c2 (make-u-boot-package "odroid-c2" "aarch64-linux-gnu")) +(define-public u-boot-banana-pi-m2-ultra + (make-u-boot-package "Bananapi_M2_Ultra" "arm-linux-gnueabihf")) + (define-public vboot-utils (package (name "vboot-utils") diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 1cc3db116..c7bfdb259 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -44,6 +44,7 @@ #:use-module (ice-9 match) #:use-module (srfi srfi-26) #:export (installation-os + banana-pi-m2-ultra-installation-os beaglebone-black-installation-os)) ;;; Commentary: @@ -399,6 +400,22 @@ You have been warned. Thanks for being so brave.\x1b[0m (tty "ttyO0")))) (operating-system-user-services installation-os))))) +(define banana-pi-m2-ultra-installation-os + (operating-system + (inherit installation-os) + (bootloader (bootloader-configuration + (bootloader u-boot-banana-pi-m2-ultra-bootloader) + (target "/dev/mmcblk1"))) ; eMMC storage + (kernel linux-libre) + (services (append + (list (agetty-service + (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. installation-os -- cgit v1.3 From 4b9e9abb36db3c658cd915bcc580dc3da8938863 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 20 Jan 2018 20:46:00 +0100 Subject: system: Add A20 OLinuXino LIME2 installer. * gnu/bootloader/u-boot.scm (u-boot-a20-olinuxino-lime2-bootloader): New exported variable. * gnu/packages/bootloaders.scm (u-boot-a20-olinuxino-lime2): New exported variable. * gnu/system/install.scm (a20-olinuxino-lime2-emmc-installation-os): New exported variable. --- gnu/bootloader/u-boot.scm | 6 ++++++ gnu/packages/bootloaders.scm | 3 +++ gnu/system/install.scm | 17 +++++++++++++++++ 3 files changed, 26 insertions(+) (limited to 'gnu/system') diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 1e3178adf..d45835c27 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -28,6 +28,7 @@ #:use-module (guix records) #:use-module (guix utils) #:export (u-boot-bootloader + u-boot-a20-olinuxino-lime2-bootloader u-boot-banana-pi-m2-ultra-bootloader u-boot-beaglebone-black-bootloader)) @@ -82,6 +83,11 @@ (inherit u-boot-bootloader) (installer install-allwinner-u-boot))) +(define u-boot-a20-olinuxino-lime2-bootloader + (bootloader + (inherit u-boot-allwinner-bootloader) + (package u-boot-a20-olinuxino-lime2))) + (define u-boot-banana-pi-m2-ultra-bootloader (bootloader (inherit u-boot-allwinner-bootloader) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 4d1f78464..b0fa2b54a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -428,6 +428,9 @@ also initializes the boards (RAM etc).") (define-public u-boot-banana-pi-m2-ultra (make-u-boot-package "Bananapi_M2_Ultra" "arm-linux-gnueabihf")) +(define-public u-boot-a20-olinuxino-lime2 + (make-u-boot-package "A20-OLinuXino-Lime2" "arm-linux-gnueabihf")) + (define-public vboot-utils (package (name "vboot-utils") diff --git a/gnu/system/install.scm b/gnu/system/install.scm index c7bfdb259..22b297c73 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -44,6 +44,7 @@ #:use-module (ice-9 match) #:use-module (srfi srfi-26) #:export (installation-os + a20-olinuxino-lime2-emmc-installation-os banana-pi-m2-ultra-installation-os beaglebone-black-installation-os)) @@ -400,6 +401,22 @@ You have been warned. Thanks for being so brave.\x1b[0m (tty "ttyO0")))) (operating-system-user-services installation-os))))) +(define a20-olinuxino-lime2-emmc-installation-os + (operating-system + (inherit installation-os) + (bootloader (bootloader-configuration + (bootloader u-boot-a20-olinuxino-lime2-bootloader) + (target "/dev/mmcblk1"))) ; eMMC storage + (kernel linux-libre) + (services (append + (list (agetty-service + (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 (operating-system (inherit installation-os) -- cgit v1.3 From a7bb327e3c457cd99710c92b5d09f76b7ab45000 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 20 Jan 2018 20:55:52 +0100 Subject: system: Add A20 OLinuXino MICRO installer. * gnu/bootloader/u-boot.scm (u-boot-a20-olinuxino-micro-bootloader): New exported variable. * gnu/packages/bootloaders.scm (u-boot-a20-olinuxino-micro): New exported variable. * gnu/system/install.scm (a20-olinuxino-micro-installation-os): New exported variable. --- gnu/bootloader/u-boot.scm | 6 ++++++ gnu/packages/bootloaders.scm | 3 +++ gnu/system/install.scm | 17 +++++++++++++++++ 3 files changed, 26 insertions(+) (limited to 'gnu/system') diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index d45835c27..535573791 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -29,6 +29,7 @@ #:use-module (guix utils) #:export (u-boot-bootloader u-boot-a20-olinuxino-lime2-bootloader + u-boot-a20-olinuxino-micro-bootloader u-boot-banana-pi-m2-ultra-bootloader u-boot-beaglebone-black-bootloader)) @@ -88,6 +89,11 @@ (inherit u-boot-allwinner-bootloader) (package u-boot-a20-olinuxino-lime2))) +(define u-boot-a20-olinuxino-micro-bootloader + (bootloader + (inherit u-boot-allwinner-bootloader) + (package u-boot-a20-olinuxino-micro))) + (define u-boot-banana-pi-m2-ultra-bootloader (bootloader (inherit u-boot-allwinner-bootloader) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index b0fa2b54a..7a5a1d88e 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -431,6 +431,9 @@ also initializes the boards (RAM etc).") (define-public u-boot-a20-olinuxino-lime2 (make-u-boot-package "A20-OLinuXino-Lime2" "arm-linux-gnueabihf")) +(define-public u-boot-a20-olinuxino-micro + (make-u-boot-package "A20-OLinuXino_MICRO" "arm-linux-gnueabihf")) + (define-public vboot-utils (package (name "vboot-utils") diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 22b297c73..56b6a99da 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -45,6 +45,7 @@ #:use-module (srfi srfi-26) #:export (installation-os a20-olinuxino-lime2-emmc-installation-os + a20-olinuxino-micro-installation-os banana-pi-m2-ultra-installation-os beaglebone-black-installation-os)) @@ -417,6 +418,22 @@ You have been warned. Thanks for being so brave.\x1b[0m (tty "ttyS0")))) (operating-system-user-services installation-os))))) +(define a20-olinuxino-micro-installation-os + (operating-system + (inherit installation-os) + (bootloader (bootloader-configuration + (bootloader u-boot-a20-olinuxino-lime2-bootloader) + (target "/dev/mmcblk0"))) ; SD card storage + (kernel linux-libre) + (services (append + (list (agetty-service + (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 (operating-system (inherit installation-os) -- cgit v1.3 From 8bac66deabb8858bfa9ac29eaf31d68ae86fd0df Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 20 Jan 2018 21:01:58 +0100 Subject: 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. --- gnu/system/install.scm | 50 ++++++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 34 deletions(-) (limited to 'gnu/system') diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 56b6a99da..714e8cac3 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -379,6 +379,14 @@ 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 beaglebone-black-installation-os (operating-system (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. #:extra-modules (list "omap_hsmmc") rest))) - (services (append - ;; mingetty does not work on serial lines. - ;; 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))))) + (services (cons* (agetty-default-service "ttyO0") + (operating-system-user-services installation-os))))) (define a20-olinuxino-lime2-emmc-installation-os (operating-system @@ -409,14 +409,8 @@ You have been warned. Thanks for being so brave.\x1b[0m (bootloader u-boot-a20-olinuxino-lime2-bootloader) (target "/dev/mmcblk1"))) ; eMMC storage (kernel linux-libre) - (services (append - (list (agetty-service - (agetty-configuration - (extra-options '("-L")) - (baud-rate "115200") - (term "vt100") - (tty "ttyS0")))) - (operating-system-user-services installation-os))))) + (services (cons* (agetty-default-service "ttyS0") + (operating-system-user-services installation-os))))) (define a20-olinuxino-micro-installation-os (operating-system @@ -425,14 +419,8 @@ You have been warned. Thanks for being so brave.\x1b[0m (bootloader u-boot-a20-olinuxino-lime2-bootloader) (target "/dev/mmcblk0"))) ; SD card storage (kernel linux-libre) - (services (append - (list (agetty-service - (agetty-configuration - (extra-options '("-L")) - (baud-rate "115200") - (term "vt100") - (tty "ttyS0")))) - (operating-system-user-services installation-os))))) + (services (cons* (agetty-default-service "ttyS0") + (operating-system-user-services installation-os))))) (define banana-pi-m2-ultra-installation-os (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) (target "/dev/mmcblk1"))) ; eMMC storage (kernel linux-libre) - (services (append - (list (agetty-service - (agetty-configuration - (extra-options '("-L")) - (baud-rate "115200") - (term "vt100") - (tty "ttyS0")))) - (operating-system-user-services installation-os))))) + (services (cons* (agetty-default-service "ttyS0") + (operating-system-user-services installation-os))))) ;; Return the default os here so 'guix system' can consume it directly. installation-os -- cgit v1.3 From fccdc8c839370558da8f05626b781bb678d86c94 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 20 Jan 2018 21:11:34 +0100 Subject: system: Factor out embedded-installation-os. * gnu/system/install.scm (embedded-installation-os): 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. --- gnu/system/install.scm | 58 ++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 30 deletions(-) (limited to 'gnu/system') diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 714e8cac3..e84e6a6bc 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -387,50 +387,48 @@ You have been warned. Thanks for being so brave.\x1b[0m (term "vt100") (tty tty)))) -(define beaglebone-black-installation-os +(define* (embedded-installation-os bootloader bootloader-target tty + #:key (extra-modules '())) + "Return an installation os for embedded systems. +The initrd gets the extra modules EXTRA-MODULES. +A getty is provided on TTY. +The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET." (operating-system (inherit installation-os) (bootloader (bootloader-configuration - (bootloader u-boot-beaglebone-black-bootloader) - (target "/dev/sda"))) + (bootloader bootloader) + (target bootloader-target))) (kernel linux-libre) (initrd (lambda (fs . rest) (apply base-initrd fs - ;; This module is required to mount the sd card. - #:extra-modules (list "omap_hsmmc") + #:extra-modules extra-modules rest))) - (services (cons* (agetty-default-service "ttyO0") + (services (cons* (agetty-default-service tty) (operating-system-user-services installation-os))))) +(define beaglebone-black-installation-os + (embedded-installation-os u-boot-beaglebone-black-bootloader + "/dev/sda" + "ttyO0" + #:extra-modules + ;; This module is required to mount the sd card. + '("omap_hsmmc"))) + + (define a20-olinuxino-lime2-emmc-installation-os - (operating-system - (inherit installation-os) - (bootloader (bootloader-configuration - (bootloader u-boot-a20-olinuxino-lime2-bootloader) - (target "/dev/mmcblk1"))) ; eMMC storage - (kernel linux-libre) - (services (cons* (agetty-default-service "ttyS0") - (operating-system-user-services installation-os))))) + (embedded-installation-os u-boot-a20-olinuxino-lime2-bootloader + "/dev/mmcblk1" ; eMMC storage + "ttyS0")) (define a20-olinuxino-micro-installation-os - (operating-system - (inherit installation-os) - (bootloader (bootloader-configuration - (bootloader u-boot-a20-olinuxino-lime2-bootloader) - (target "/dev/mmcblk0"))) ; SD card storage - (kernel linux-libre) - (services (cons* (agetty-default-service "ttyS0") - (operating-system-user-services installation-os))))) + (embedded-installation-os u-boot-a20-olinuxino-micro-bootloader + "/dev/mmcblk0" ; SD card storage + "ttyS0")) (define banana-pi-m2-ultra-installation-os - (operating-system - (inherit installation-os) - (bootloader (bootloader-configuration - (bootloader u-boot-banana-pi-m2-ultra-bootloader) - (target "/dev/mmcblk1"))) ; eMMC storage - (kernel linux-libre) - (services (cons* (agetty-default-service "ttyS0") - (operating-system-user-services installation-os))))) + (embedded-installation-os u-boot-banana-pi-m2-ultra-bootloader + "/dev/mmcblk1" ; eMMC storage + "ttyS0")) ;; Return the default os here so 'guix system' can consume it directly. installation-os -- cgit v1.3 From 84ee33787e011fbf7d04eed1bc2d0765cef57b52 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 20 Jan 2018 22:05:16 +0100 Subject: system: Add Nintendo NES Classic Edition installer. * gnu/bootloader/u-boot.scm (u-boot-nintendo-nes-classic-edition-bootloader): New exported variable. * gnu/packages/bootloaders.scm (u-boot-nintendo-nes-classic-edition): New exported variable. * gnu/system/install.scm (nintendo-nes-classic-edition-installation-os): New exported variable. --- gnu/bootloader/u-boot.scm | 8 +++++++- gnu/packages/bootloaders.scm | 3 +++ gnu/system/install.scm | 8 +++++++- 3 files changed, 17 insertions(+), 2 deletions(-) (limited to 'gnu/system') diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 535573791..d80ffdb96 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -31,7 +31,8 @@ u-boot-a20-olinuxino-lime2-bootloader u-boot-a20-olinuxino-micro-bootloader u-boot-banana-pi-m2-ultra-bootloader - u-boot-beaglebone-black-bootloader)) + u-boot-beaglebone-black-bootloader + u-boot-nintendo-nes-classic-edition-bootloader)) (define install-u-boot #~(lambda (bootloader device mount-point) @@ -84,6 +85,11 @@ (inherit u-boot-bootloader) (installer install-allwinner-u-boot))) +(define u-boot-nintendo-nes-classic-edition-bootloader + (bootloader + (inherit u-boot-allwinner-bootloader) + (package u-boot-nintendo-nes-classic-edition))) + (define u-boot-a20-olinuxino-lime2-bootloader (bootloader (inherit u-boot-allwinner-bootloader) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index e6fc9b602..d16db455f 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -436,6 +436,9 @@ also initializes the boards (RAM etc).") (define-public u-boot-a20-olinuxino-micro (make-u-boot-package "A20-OLinuXino_MICRO" "arm-linux-gnueabihf")) +(define-public u-boot-nintendo-nes-classic-edition + (make-u-boot-package "Nintendo_NES_Classic_Edition" "arm-linux-gnueabihf")) + (define-public vboot-utils (package (name "vboot-utils") diff --git a/gnu/system/install.scm b/gnu/system/install.scm index e84e6a6bc..fe330621c 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -47,7 +47,8 @@ a20-olinuxino-lime2-emmc-installation-os a20-olinuxino-micro-installation-os banana-pi-m2-ultra-installation-os - beaglebone-black-installation-os)) + beaglebone-black-installation-os + nintendo-nes-classic-edition-installation-os)) ;;; Commentary: ;;; @@ -430,6 +431,11 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET." "/dev/mmcblk1" ; eMMC storage "ttyS0")) +(define nintendo-nes-classic-edition-installation-os + (embedded-installation-os u-boot-nintendo-nes-classic-edition-bootloader + "/dev/mmcblk0" ; SD card (solder it yourself) + "ttyS0")) + ;; Return the default os here so 'guix system' can consume it directly. installation-os -- cgit v1.3 From 30875d07ef7c970c77ee6117043ad59c16a4e777 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 21 Jan 2018 00:18:34 +0100 Subject: doc: No longer mention Wicd in OS examples. * gnu/system/examples/desktop.tmpl, gnu/system/examples/lightweight-desktop.tmpl: Mention NetworkManager instead of Wicd. --- gnu/system/examples/desktop.tmpl | 4 ++-- gnu/system/examples/lightweight-desktop.tmpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/system') diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl index 2131d1f18..e8740407d 100644 --- a/gnu/system/examples/desktop.tmpl +++ b/gnu/system/examples/desktop.tmpl @@ -48,8 +48,8 @@ ;; Add GNOME and/or Xfce---we can choose at the log-in ;; screen with F1. Use the "desktop" services, which - ;; include the X11 log-in service, networking with Wicd, - ;; and more. + ;; include the X11 log-in service, networking with + ;; NetworkManager, and more. (services (cons* (gnome-desktop-service) (xfce-desktop-service) %desktop-services)) diff --git a/gnu/system/examples/lightweight-desktop.tmpl b/gnu/system/examples/lightweight-desktop.tmpl index d13c04c76..65a8ee180 100644 --- a/gnu/system/examples/lightweight-desktop.tmpl +++ b/gnu/system/examples/lightweight-desktop.tmpl @@ -47,7 +47,7 @@ %base-packages)) ;; Use the "desktop" services, which include the X11 - ;; log-in service, networking with Wicd, and more. + ;; log-in service, networking with NetworkManager, and more. (services %desktop-services) ;; Allow resolution of '.local' host names with mDNS. -- cgit v1.3 From c55c6985948b12a39cd5805bde95db9a80def3ba Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 22 Jan 2018 22:35:06 +0100 Subject: system: Add A20 OLinuXino LIME installer. * gnu/bootloader/u-boot.scm (u-boot-a20-olinuxino-lime-bootloader): New exported variable. * gnu/packages/bootloaders.scm (u-boot-a20-olinuxino-lime): New exported variable. * gnu/system/install.scm (a20-olinuxino-lime-installation-os): New exported variable. --- gnu/bootloader/u-boot.scm | 6 ++++++ gnu/packages/bootloaders.scm | 3 +++ gnu/system/install.scm | 6 ++++++ 3 files changed, 15 insertions(+) (limited to 'gnu/system') diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index d80ffdb96..21d0aecce 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -28,6 +28,7 @@ #:use-module (guix records) #:use-module (guix utils) #:export (u-boot-bootloader + u-boot-a20-olinuxino-lime-bootloader u-boot-a20-olinuxino-lime2-bootloader u-boot-a20-olinuxino-micro-bootloader u-boot-banana-pi-m2-ultra-bootloader @@ -90,6 +91,11 @@ (inherit u-boot-allwinner-bootloader) (package u-boot-nintendo-nes-classic-edition))) +(define u-boot-a20-olinuxino-lime-bootloader + (bootloader + (inherit u-boot-allwinner-bootloader) + (package u-boot-a20-olinuxino-lime))) + (define u-boot-a20-olinuxino-lime2-bootloader (bootloader (inherit u-boot-allwinner-bootloader) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index d16db455f..f7aa21fa6 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -430,6 +430,9 @@ also initializes the boards (RAM etc).") (define-public u-boot-banana-pi-m2-ultra (make-u-boot-package "Bananapi_M2_Ultra" "arm-linux-gnueabihf")) +(define-public u-boot-a20-olinuxino-lime + (make-u-boot-package "A20-OLinuXino-Lime" "arm-linux-gnueabihf")) + (define-public u-boot-a20-olinuxino-lime2 (make-u-boot-package "A20-OLinuXino-Lime2" "arm-linux-gnueabihf")) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index fe330621c..286415052 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -44,6 +44,7 @@ #:use-module (ice-9 match) #:use-module (srfi srfi-26) #:export (installation-os + a20-olinuxino-lime-installation-os a20-olinuxino-lime2-emmc-installation-os a20-olinuxino-micro-installation-os banana-pi-m2-ultra-installation-os @@ -416,6 +417,11 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET." '("omap_hsmmc"))) +(define a20-olinuxino-lime-sd-installation-os + (embedded-installation-os u-boot-a20-olinuxino-lime-bootloader + "/dev/mmcblk0" ; SD card storage + "ttyS0")) + (define a20-olinuxino-lime2-emmc-installation-os (embedded-installation-os u-boot-a20-olinuxino-lime2-bootloader "/dev/mmcblk1" ; eMMC storage -- cgit v1.3 From 0db22b32ce5efa34c8f4f12649a248bce2fff250 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 23 Jan 2018 12:00:14 +0100 Subject: system: Rename a20-olinuxino-lime-sd-installation-os. * gnu/system/install.scm (a20-olinuxino-lime-sd-installation-os): Rename to... (a20-olinuxino-lime-installation-os): ...this. --- gnu/system/install.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/system') diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 286415052..e4b2e8237 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -417,7 +417,7 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET." '("omap_hsmmc"))) -(define a20-olinuxino-lime-sd-installation-os +(define a20-olinuxino-lime-installation-os (embedded-installation-os u-boot-a20-olinuxino-lime-bootloader "/dev/mmcblk0" ; SD card storage "ttyS0")) -- cgit v1.3 From 6d5a65de7fba53ca1160844550d261f540f110e1 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 20 Jan 2018 01:57:07 -0500 Subject: system: Put locales where libc will find them. * gnu/system/locale.scm (localedef-command, single-locale-directory): Use only the major+minor part of the libc version number in the locale directory name. --- gnu/system/locale.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/system') diff --git a/gnu/system/locale.scm b/gnu/system/locale.scm index 75cb855b5..75417f669 100644 --- a/gnu/system/locale.scm +++ b/gnu/system/locale.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2018 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ #:use-module (guix store) #:use-module (guix records) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (srfi srfi-26) @@ -90,9 +92,9 @@ or #f on failure." "--no-archive" "--prefix" #$output "-i" #$(locale-definition-source locale) "-f" #$(locale-definition-charset locale) - (string-append #$output "/" - #$(package-version libc) "/" - #$(locale-definition-name locale)))))) + (string-append #$output "/" #$(version-major+minor + (package-version libc)) + "/" #$(locale-definition-name locale)))))) (define* (single-locale-directory locales #:key (libc (canonical-package glibc))) @@ -102,7 +104,7 @@ Because locale data formats are incompatible when switching from one libc to another, locale data is put in a sub-directory named after the 'version' field of LIBC." (define version - (package-version libc)) + (version-major+minor (package-version libc))) (define build #~(begin -- cgit v1.3 From e0e10e2f58a84054a2092b217501272433b8c43c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 29 Jan 2018 05:54:54 -0500 Subject: gnu: linux-libre: NVME core support is now built-in. * gnu/system/linux-initrd.scm (base-initrd)[linux-modules]: Remove "nvme". * gnu/packages/aux-files/linux-libre/4.1-i686.conf, gnu/packages/aux-files/linux-libre/4.1-x86_64.conf, gnu/packages/aux-files/linux-libre/4.4-i686.conf, gnu/packages/aux-files/linux-libre/4.4-x86_64.conf: Set CONFIG_BLK_DEV_NVME=y. * gnu/packages/aux-files/linux-libre/4.9-i686.conf, gnu/packages/aux-files/linux-libre/4.9-x86_64.conf, gnu/packages/aux-files/linux-libre/4.14-arm.conf, gnu/packages/aux-files/linux-libre/4.14-i686.conf, gnu/packages/aux-files/linux-libre/4.14-x86_64.conf: Set CONFIG_BLK_DEV_NVME=y and CONFIG_NVME_CORE=y. --- gnu/packages/aux-files/linux-libre/4.1-i686.conf | 2 +- gnu/packages/aux-files/linux-libre/4.1-x86_64.conf | 2 +- gnu/packages/aux-files/linux-libre/4.14-arm.conf | 4 ++-- gnu/packages/aux-files/linux-libre/4.14-i686.conf | 4 ++-- gnu/packages/aux-files/linux-libre/4.14-x86_64.conf | 4 ++-- gnu/packages/aux-files/linux-libre/4.4-i686.conf | 2 +- gnu/packages/aux-files/linux-libre/4.4-x86_64.conf | 2 +- gnu/packages/aux-files/linux-libre/4.9-i686.conf | 4 ++-- gnu/packages/aux-files/linux-libre/4.9-x86_64.conf | 4 ++-- gnu/system/linux-initrd.scm | 1 - 10 files changed, 14 insertions(+), 15 deletions(-) (limited to 'gnu/system') diff --git a/gnu/packages/aux-files/linux-libre/4.1-i686.conf b/gnu/packages/aux-files/linux-libre/4.1-i686.conf index a37225541..24b5e6115 100644 --- a/gnu/packages/aux-files/linux-libre/4.1-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.1-i686.conf @@ -1954,7 +1954,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_DRBD=m # CONFIG_DRBD_FAULT_INJECTION is not set CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_NVME=m +CONFIG_BLK_DEV_NVME=y CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=y diff --git a/gnu/packages/aux-files/linux-libre/4.1-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.1-x86_64.conf index 82c582492..c89bfedd4 100644 --- a/gnu/packages/aux-files/linux-libre/4.1-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.1-x86_64.conf @@ -1919,7 +1919,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_DRBD=m # CONFIG_DRBD_FAULT_INJECTION is not set CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_NVME=m +CONFIG_BLK_DEV_NVME=y CONFIG_BLK_DEV_SKD=m CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_SX8=m diff --git a/gnu/packages/aux-files/linux-libre/4.14-arm.conf b/gnu/packages/aux-files/linux-libre/4.14-arm.conf index 2bde47018..bc7fe85ae 100644 --- a/gnu/packages/aux-files/linux-libre/4.14-arm.conf +++ b/gnu/packages/aux-files/linux-libre/4.14-arm.conf @@ -2051,8 +2051,8 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_BLK_DEV_RBD=m # CONFIG_BLK_DEV_RSXX is not set -CONFIG_NVME_CORE=m -CONFIG_BLK_DEV_NVME=m +CONFIG_NVME_CORE=y +CONFIG_BLK_DEV_NVME=y CONFIG_NVME_FABRICS=m CONFIG_NVME_RDMA=m # CONFIG_NVME_FC is not set diff --git a/gnu/packages/aux-files/linux-libre/4.14-i686.conf b/gnu/packages/aux-files/linux-libre/4.14-i686.conf index c7b65d212..eb471a324 100644 --- a/gnu/packages/aux-files/linux-libre/4.14-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.14-i686.conf @@ -2156,8 +2156,8 @@ CONFIG_VIRTIO_BLK=y # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RSXX=m -CONFIG_NVME_CORE=m -CONFIG_BLK_DEV_NVME=m +CONFIG_NVME_CORE=y +CONFIG_BLK_DEV_NVME=y CONFIG_NVME_FABRICS=m CONFIG_NVME_RDMA=m CONFIG_NVME_FC=m diff --git a/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf index 6fe42fd50..1f2be0a0a 100644 --- a/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf @@ -2140,8 +2140,8 @@ CONFIG_VIRTIO_BLK=y # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RSXX=m -CONFIG_NVME_CORE=m -CONFIG_BLK_DEV_NVME=m +CONFIG_NVME_CORE=y +CONFIG_BLK_DEV_NVME=y CONFIG_NVME_FABRICS=m CONFIG_NVME_RDMA=m CONFIG_NVME_FC=m diff --git a/gnu/packages/aux-files/linux-libre/4.4-i686.conf b/gnu/packages/aux-files/linux-libre/4.4-i686.conf index e877f195a..0ce2473f3 100644 --- a/gnu/packages/aux-files/linux-libre/4.4-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.4-i686.conf @@ -2016,7 +2016,7 @@ CONFIG_VIRTIO_BLK=y # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RSXX=m -CONFIG_BLK_DEV_NVME=m +CONFIG_BLK_DEV_NVME=y # # Misc devices diff --git a/gnu/packages/aux-files/linux-libre/4.4-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.4-x86_64.conf index 406053ab7..5024685b6 100644 --- a/gnu/packages/aux-files/linux-libre/4.4-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.4-x86_64.conf @@ -1980,7 +1980,7 @@ CONFIG_VIRTIO_BLK=y # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RSXX=m -CONFIG_BLK_DEV_NVME=m +CONFIG_BLK_DEV_NVME=y # # Misc devices diff --git a/gnu/packages/aux-files/linux-libre/4.9-i686.conf b/gnu/packages/aux-files/linux-libre/4.9-i686.conf index 4f3a9f927..912045074 100644 --- a/gnu/packages/aux-files/linux-libre/4.9-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.9-i686.conf @@ -2105,8 +2105,8 @@ CONFIG_VIRTIO_BLK=y # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RSXX=m -CONFIG_NVME_CORE=m -CONFIG_BLK_DEV_NVME=m +CONFIG_NVME_CORE=y +CONFIG_BLK_DEV_NVME=y # CONFIG_BLK_DEV_NVME_SCSI is not set CONFIG_NVME_FABRICS=m CONFIG_NVME_RDMA=m diff --git a/gnu/packages/aux-files/linux-libre/4.9-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.9-x86_64.conf index ca0fcded6..35e38c93a 100644 --- a/gnu/packages/aux-files/linux-libre/4.9-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.9-x86_64.conf @@ -2081,8 +2081,8 @@ CONFIG_VIRTIO_BLK=y # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RSXX=m -CONFIG_NVME_CORE=m -CONFIG_BLK_DEV_NVME=m +CONFIG_NVME_CORE=y +CONFIG_BLK_DEV_NVME=y # CONFIG_BLK_DEV_NVME_SCSI is not set CONFIG_NVME_FABRICS=m CONFIG_NVME_RDMA=m diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 0f7f4721d..330438bce 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -290,7 +290,6 @@ loaded at boot time in the order in which they appear." "usb-storage" "uas" ;for the installation image etc. "usbhid" "hid-generic" "hid-apple" ;keyboards during early boot "dm-crypt" "xts" "serpent_generic" "wp512" ;for encrypted root partitions - "nvme" ;for new SSD NVMe devices "nls_iso8859-1" ;for `mkfs.fat`, et.al ,@(if (string-match "^(x86_64|i[3-6]86)-" (%current-system)) '("pata_acpi" "pata_atiixp" ;for ATA controllers -- cgit v1.3 From 5a9902c8acd63916c6c80cf3c61be6ee814b7e3d Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 9 Feb 2018 17:07:25 +0100 Subject: 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. --- doc/guix.texi | 15 +++++++++- gnu/services/base.scm | 76 ++++++++++++++++++++++++++++++++++++++++---------- gnu/system/install.scm | 15 +++------- 3 files changed, 79 insertions(+), 27 deletions(-) (limited to 'gnu/system') diff --git a/doc/guix.texi b/doc/guix.texi index 9dafe60ee..8a9e1bc99 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9724,7 +9724,20 @@ man page for more information. @item @code{tty} The name of the console this agetty runs on, as a string---e.g., -@code{"ttyS0"}. This argument is mandatory. +@code{"ttyS0"}. This argument is optional, it will default to +a reasonable default serial port used by the kernel Linux. + +For this, if there is a value for an option @code{agetty.tty} in the kernel +command line, agetty will extract the device name of the serial port +from it and use that. + +If not and if there is a value for an option @code{console} with a tty in +the Linux command line, agetty will extract the device name of the +serial port from it and use that. + +In both cases, agetty will leave the other serial device settings +(baud rate etc.) alone---in the hope that Linux pinned them to the +correct values. @item @code{baud-rate} (default: @code{#f}) A string containing a comma-separated list of one or more baud rates, in diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 8e30bcd34..e1c634617 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,40 @@ the message of the day, among other things." ;;; (default #f)) ) +(define (default-serial-port) + "Return a gexp that determines a reasonable default serial port +to use as the tty. This is primarily useful for headless systems." + #~(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) + (let* ((not-comma (char-set-complement (char-set #\,))) + (command (linux-command-line)) + (agetty-specs (find-long-options "agetty.tty" command)) + (console-specs (filter (lambda (spec) + (and (string-prefix? "tty" spec) + (not (or + (string-prefix? "tty0" spec) + (string-prefix? "tty1" spec) + (string-prefix? "tty2" spec) + (string-prefix? "tty3" spec) + (string-prefix? "tty4" spec) + (string-prefix? "tty5" spec) + (string-prefix? "tty6" spec) + (string-prefix? "tty7" spec) + (string-prefix? "tty8" spec) + (string-prefix? "tty9" spec))))) + (find-long-options "console" command))) + (specs (append agetty-specs console-specs))) + (match specs + (() #f) + ((spec _ ...) + ;; Extract device name from first spec. + (match (string-tokenize spec not-comma) + ((device-name _ ...) + device-name))))))) + (define agetty-shepherd-service (match-lambda (($ agetty tty term baud-rate auto-login @@ -900,8 +934,9 @@ the message of the day, among other things." erase-characters kill-characters chdir delay nice extra-options) (list (shepherd-service + (modules '((ice-9 match) (gnu build linux-boot))) (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 +981,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 +1047,7 @@ the message of the day, among other things." #$@(if login-pause? #~("--login-pause") #~()) - #$tty + #$(or tty (default-serial-port)) #$@(if baud-rate #~(#$baud-rate) #~()) @@ -1058,18 +1096,21 @@ the tty to run, among other things." ;; text is not lost in the middle of kernel messages (XXX). (requirement '(user-processes host-name udev)) - (start #~(make-forkexec-constructor - (list #$(file-append mingetty "/sbin/mingetty") - "--noclear" #$tty - #$@(if auto-login - #~("--autologin" #$auto-login) - #~()) - #$@(if login-program - #~("--loginprog" #$login-program) - #~()) - #$@(if login-pause? - #~("--loginpause") - #~())))) + (start #~(let ((tty #$(default-serial-port))) + (if tty + (make-forkexec-constructor + (list #$(file-append mingetty "/sbin/mingetty") + "--noclear" #$tty + #$@(if auto-login + #~("--autologin" #$auto-login) + #~()) + #$@(if login-program + #~("--loginprog" #$login-program) + #~()) + #$@(if login-pause? + #~("--loginpause") + #~()))) + (const #f)))) ; never start. (stop #~(make-kill-destructor))))))) (define mingetty-service-type @@ -2012,6 +2053,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..b61660b4b 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 -- cgit v1.3