aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-12-04 00:37:11 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-12-04 00:37:11 -0500
commit08dc9f2ca2e96476aa51c906c8ba01ca5d033568 (patch)
treeefe482c8e61f088e5d4ae2bc2c84789f3ff7e4a6
parentbf46192d4c7c4cd8d71edb8ace2cdf86322aafe7 (diff)
downloadguix-08dc9f2ca2e96476aa51c906c8ba01ca5d033568.tar.gz
guix-08dc9f2ca2e96476aa51c906c8ba01ca5d033568.zip
gnu: Do not use 'local-file' in Raspberry Pi OS examples.
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>
-rw-r--r--gnu/system/examples/raspberry-pi-64-nfs-root.tmpl7
-rw-r--r--gnu/system/examples/raspberry-pi-64.tmpl7
2 files changed, 2 insertions, 12 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)))