diff options
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/examples/raspberry-pi-64-nfs-root.tmpl | 7 | ||||
| -rw-r--r-- | gnu/system/examples/raspberry-pi-64.tmpl | 7 | ||||
| -rw-r--r-- | gnu/system/images/pine64.scm | 21 | ||||
| -rw-r--r-- | gnu/system/install.scm | 20 |
4 files changed, 35 insertions, 20 deletions
diff --git a/gnu/system/examples/raspberry-pi-64-nfs-root.tmpl b/gnu/system/examples/raspberry-pi-64-nfs-root.tmpl index 7bcac8ded0..8c47c650f6 100644 --- a/gnu/system/examples/raspberry-pi-64-nfs-root.tmpl +++ b/gnu/system/examples/raspberry-pi-64-nfs-root.tmpl @@ -21,9 +21,6 @@ raspberry-pi ssh) -(define %my-public-key - (local-file (string-append (getenv "HOME") "/.ssh/id_ecdsa.pub"))) - (define-public raspberry-pi-64-nfs-root (operating-system (host-name "raspberrypi-guix") @@ -66,9 +63,7 @@ (service ntp-service-type) (service openssh-service-type (openssh-configuration - (x11-forwarding? #t) - (authorized-keys - `(("pi" ,%my-public-key))))) + (x11-forwarding? #t))) %base-services)) (name-service-switch %mdns-host-lookup-nss))) diff --git a/gnu/system/examples/raspberry-pi-64.tmpl b/gnu/system/examples/raspberry-pi-64.tmpl index 7d2638dd80..3ad588207c 100644 --- a/gnu/system/examples/raspberry-pi-64.tmpl +++ b/gnu/system/examples/raspberry-pi-64.tmpl @@ -20,9 +20,6 @@ raspberry-pi ssh) -(define %my-public-key - (local-file (string-append (getenv "HOME") "/.ssh/id_ecdsa.pub"))) - (define-public raspberry-pi-64 (operating-system (host-name "raspberrypi-guix") @@ -70,9 +67,7 @@ (service ntp-service-type) (service openssh-service-type (openssh-configuration - (x11-forwarding? #t) - (authorized-keys - `(("pi" ,%my-public-key))))) + (x11-forwarding? #t))) %base-services)) (name-service-switch %mdns-host-lookup-nss))) diff --git a/gnu/system/images/pine64.scm b/gnu/system/images/pine64.scm index a2d471b802..3feb69764d 100644 --- a/gnu/system/images/pine64.scm +++ b/gnu/system/images/pine64.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> +;;; Copyright © 2022 Gabriel Wicki <gabriel@erlikon.ch> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,9 +22,11 @@ #:use-module (gnu bootloader u-boot) #:use-module (gnu image) #:use-module (gnu packages linux) + #:use-module (gnu packages certs) #:use-module (guix platforms arm) #:use-module (gnu services) #:use-module (gnu services base) + #:use-module (gnu services networking) #:use-module (gnu system) #:use-module (gnu system file-systems) #:use-module (gnu system image) @@ -47,13 +50,17 @@ (mount-point "/") (type "ext4")) %base-file-systems)) - (services (cons (service agetty-service-type - (agetty-configuration - (extra-options '("-L")) ; no carrier detect - (baud-rate "115200") - (term "vt100") - (tty "ttyS0"))) - %base-services)))) + (services (cons* + (service agetty-service-type + (agetty-configuration + (extra-options '("-L")) ; no carrier detect + (baud-rate "115200") + (term "vt100") + (tty "ttyS0"))) + (service dhcp-client-service-type) + (service ntp-service-type) + %base-services)) + (packages (cons nss-certs %base-packages)))) (define pine64-image-type (image-type diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 003c49a3e7..f6f1923121 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -48,6 +48,9 @@ #:use-module (gnu packages bootloaders) #:use-module (gnu packages certs) #:use-module (gnu packages compression) + #:use-module (gnu packages cryptsetup) + #:use-module (gnu packages disk) + #:use-module (gnu packages file-systems) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages guile) @@ -458,6 +461,21 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m \x1b[1;33mUse Alt-F2 for documentation.\x1b[0m ") +(define %installer-disk-utilities + ;; A well-rounded set of packages for interacting with disks, partitions and + ;; file systems, included with the Guix installation image. + (list parted gptfdisk ddrescue + ;; We used to provide fdisk from GNU fdisk, but as of version 2.0.0a + ;; it pulls Guile 1.8, which takes unreasonable space; furthermore + ;; util-linux's fdisk is already available, in %base-packages-linux. + cryptsetup mdadm + dosfstools + btrfs-progs + e2fsprogs + f2fs-tools + jfsutils + xfsprogs)) + (define installation-os ;; The operating system used on installation images for USB sticks etc. (operating-system @@ -530,7 +548,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m font-dejavu font-gnu-unifont grub ; mostly so xrefs to its manual work nss-certs) ; To access HTTPS, use git, etc. - %base-packages-disk-utilities + %installer-disk-utilities %base-packages)))) (define* (os-with-u-boot os board #:key (bootloader-target "/dev/mmcblk0") |