summaryrefslogtreecommitdiff
path: root/gnu/machine/ssh.scm
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2020-08-25 12:39:11 +0200
committerMathieu Othacehe <othacehe@gnu.org>2020-08-25 12:39:11 +0200
commitdac7dd1b0b40c9f8c81b5147c68f6387c2b16bfd (patch)
tree7ee1acfecb728fec3a2b0c2373970449c82622a7 /gnu/machine/ssh.scm
parent5fe12be0dd03d1a316343549f8c131d931f21a9a (diff)
Remove "guile-zlib" extension when unused.
This is a follow-up of 755f365b02b42a5d1e8ef3000dadef069553a478. As (zlib) is autoloaded in (gnu build linux-modules), "guile-zlib" is needed as an extension only when it is effectively used. * gnu/installer.scm (installer-program): Remove "guile-zlib" from the extensions. * gnu/machine/ssh.scm (machine-check-initrd-modules): Ditto. * gnu/services.scm (activation-script): Ditto. * gnu/services/base.scm (default-serial-port): Ditto, (agetty-shepherd-service): ditto, (udev-service-type): ditto. * gnu/system/image.scm (gcrypt-sqlite3&co): Ditto. * gnu/system/shadow.scm (account-shepherd-service): Ditto.
Diffstat (limited to 'gnu/machine/ssh.scm')
-rw-r--r--gnu/machine/ssh.scm35
1 files changed, 16 insertions, 19 deletions
diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm
index ee5032e2810..4e31baa4b96 100644
--- a/gnu/machine/ssh.scm
+++ b/gnu/machine/ssh.scm
@@ -21,7 +21,6 @@
21 #:use-module (gnu bootloader) 21 #:use-module (gnu bootloader)
22 #:use-module (gnu machine) 22 #:use-module (gnu machine)
23 #:autoload (gnu packages gnupg) (guile-gcrypt) 23 #:autoload (gnu packages gnupg) (guile-gcrypt)
24 #:autoload (gnu packages guile) (guile-zlib)
25 #:use-module (gnu system) 24 #:use-module (gnu system)
26 #:use-module (gnu system file-systems) 25 #:use-module (gnu system file-systems)
27 #:use-module (gnu system uuid) 26 #:use-module (gnu system uuid)
@@ -249,24 +248,22 @@ not available in the initrd."
249 '((gnu build file-systems) 248 '((gnu build file-systems)
250 (gnu build linux-modules) 249 (gnu build linux-modules)
251 (gnu system uuid))) 250 (gnu system uuid)))
252 (with-extensions (list guile-zlib) 251 #~(begin
253 #~(begin 252 (use-modules (gnu build file-systems)
254 (use-modules (gnu build file-systems) 253 (gnu build linux-modules)
255 (gnu build linux-modules) 254 (gnu system uuid))
256 (gnu system uuid)) 255
257 256 (define dev
258 (define dev 257 #$(cond ((string? device) device)
259 #$(cond ((string? device) device) 258 ((uuid? device) #~(find-partition-by-uuid
260 ((uuid? device) #~(find-partition-by-uuid 259 (string->uuid
261 (string->uuid 260 #$(uuid->string device))))
262 #$(uuid->string device)))) 261 ((file-system-label? device)
263 ((file-system-label? device) 262 #~(find-partition-by-label
264 #~(find-partition-by-label 263 #$(file-system-label->string device)))))
265 #$(file-system-label->string device))))) 264
266 265 (missing-modules dev '#$(operating-system-initrd-modules
267 (missing-modules dev 266 (machine-operating-system machine)))))))
268 '#$(operating-system-initrd-modules
269 (machine-operating-system machine))))))))
270 267
271 (remote-let ((missing remote-exp)) 268 (remote-let ((missing remote-exp))
272 (unless (null? missing) 269 (unless (null? missing)