summaryrefslogtreecommitdiff
path: root/gnu/machine
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
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')
-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 ee5032e281..4e31baa4b9 100644
--- a/gnu/machine/ssh.scm
+++ b/gnu/machine/ssh.scm
@@ -21,7 +21,6 @@
#:use-module (gnu bootloader)
#:use-module (gnu machine)
#:autoload (gnu packages gnupg) (guile-gcrypt)
- #:autoload (gnu packages guile) (guile-zlib)
#:use-module (gnu system)
#:use-module (gnu system file-systems)
#:use-module (gnu system uuid)
@@ -249,24 +248,22 @@ not available in the initrd."
'((gnu build file-systems)
(gnu build linux-modules)
(gnu system uuid)))
- (with-extensions (list guile-zlib)
- #~(begin
- (use-modules (gnu build file-systems)
- (gnu build linux-modules)
- (gnu system uuid))
-
- (define dev
- #$(cond ((string? device) device)
- ((uuid? device) #~(find-partition-by-uuid
- (string->uuid
- #$(uuid->string device))))
- ((file-system-label? device)
- #~(find-partition-by-label
- #$(file-system-label->string device)))))
-
- (missing-modules dev
- '#$(operating-system-initrd-modules
- (machine-operating-system machine))))))))
+ #~(begin
+ (use-modules (gnu build file-systems)
+ (gnu build linux-modules)
+ (gnu system uuid))
+
+ (define dev
+ #$(cond ((string? device) device)
+ ((uuid? device) #~(find-partition-by-uuid
+ (string->uuid
+ #$(uuid->string device))))
+ ((file-system-label? device)
+ #~(find-partition-by-label
+ #$(file-system-label->string device)))))
+
+ (missing-modules dev '#$(operating-system-initrd-modules
+ (machine-operating-system machine)))))))
(remote-let ((missing remote-exp))
(unless (null? missing)