amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Do not use 'local-file' in Raspberry Pi OS examples.

Browse source 
As this breaks the 'tests/guix-system.sh' test.

* gnu/system/examples/raspberry-pi-64-nfs-root.tmpl (%my-public-key): Delete
variable.
(raspberry-pi-64-nfs-root) [services]: Remove key from openssh-configuration.
* gnu/system/examples/raspberry-pi-64.tmpl: Likewise.

Reported-by: Vagrant Cascadian <vagrant@debian.org>
This commit is contained in:
Maxim Cournoyer 2022-12-04 00:37:11 -05:00
parent bf46192d4c
commit 08dc9f2ca2
No known key found for this signature in database
GPG key ID: 1260E46482E63562
2 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gnu/system/examples/raspberry-pi-64-nfs-root.tmpl
View file

@ -21,9 +21,6 @@
raspberry-pi raspberry-pi
ssh) ssh)
(define %my-public-key
(local-file (string-append (getenv "HOME") "/.ssh/id_ecdsa.pub")))
(define-public raspberry-pi-64-nfs-root (define-public raspberry-pi-64-nfs-root
(operating-system (operating-system
(host-name "raspberrypi-guix") (host-name "raspberrypi-guix")
@ -66,9 +63,7 @@
(service ntp-service-type) (service ntp-service-type)
(service openssh-service-type (service openssh-service-type
(openssh-configuration (openssh-configuration
(x11-forwarding? #t) (x11-forwarding? #t)))
(authorized-keys
`(("pi" ,%my-public-key)))))
%base-services)) %base-services))
(name-service-switch %mdns-host-lookup-nss))) (name-service-switch %mdns-host-lookup-nss)))

7
gnu/system/examples/raspberry-pi-64.tmpl
View file

@ -20,9 +20,6 @@
raspberry-pi raspberry-pi
ssh) ssh)
(define %my-public-key
(local-file (string-append (getenv "HOME") "/.ssh/id_ecdsa.pub")))
(define-public raspberry-pi-64 (define-public raspberry-pi-64
(operating-system (operating-system
(host-name "raspberrypi-guix") (host-name "raspberrypi-guix")
@ -70,9 +67,7 @@
(service ntp-service-type) (service ntp-service-type)
(service openssh-service-type (service openssh-service-type
(openssh-configuration (openssh-configuration
(x11-forwarding? #t) (x11-forwarding? #t)))
(authorized-keys
`(("pi" ,%my-public-key)))))
%base-services)) %base-services))
(name-service-switch %mdns-host-lookup-nss))) (name-service-switch %mdns-host-lookup-nss)))