aboutsummaryrefslogtreecommitdiff
path: root/gnu/services.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/services.scm
parent5fe12be0dd03d1a316343549f8c131d931f21a9a (diff)
downloadguix-dac7dd1b0b40c9f8c81b5147c68f6387c2b16bfd.tar
guix-dac7dd1b0b40c9f8c81b5147c68f6387c2b16bfd.tar.gz
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/services.scm')
-rw-r--r--gnu/services.scm46
1 files changed, 22 insertions, 24 deletions
diff --git a/gnu/services.scm b/gnu/services.scm
index 3e59c6401f..11ba21e824 100644
--- a/gnu/services.scm
+++ b/gnu/services.scm
@@ -35,7 +35,6 @@
#:use-module (guix modules)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
- #:use-module (gnu packages guile)
#:use-module (gnu packages hurd)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-9)
@@ -586,29 +585,28 @@ ACTIVATION-SCRIPT-TYPE."
(with-imported-modules (source-module-closure
'((gnu build activation)
(guix build utils)))
- (with-extensions (list guile-zlib)
- #~(begin
- (use-modules (gnu build activation)
- (guix build utils))
-
- ;; Make sure the user accounting database exists. If
- ;; it does not exist, 'setutxent' does not create it
- ;; and thus there is no accounting at all.
- (close-port (open-file "/var/run/utmpx" "a0"))
-
- ;; Same for 'wtmp', which is populated by mingetty et
- ;; al.
- (mkdir-p "/var/log")
- (close-port (open-file "/var/log/wtmp" "a0"))
-
- ;; Set up /run/current-system. Among other things
- ;; this sets up locales, which the activation snippets
- ;; executed below may expect.
- (activate-current-system)
-
- ;; Run the services' activation snippets.
- ;; TODO: Use 'load-compiled'.
- (for-each primitive-load '#$actions))))))
+ #~(begin
+ (use-modules (gnu build activation)
+ (guix build utils))
+
+ ;; Make sure the user accounting database exists. If it
+ ;; does not exist, 'setutxent' does not create it and
+ ;; thus there is no accounting at all.
+ (close-port (open-file "/var/run/utmpx" "a0"))
+
+ ;; Same for 'wtmp', which is populated by mingetty et
+ ;; al.
+ (mkdir-p "/var/log")
+ (close-port (open-file "/var/log/wtmp" "a0"))
+
+ ;; Set up /run/current-system. Among other things this
+ ;; sets up locales, which the activation snippets
+ ;; executed below may expect.
+ (activate-current-system)
+
+ ;; Run the services' activation snippets.
+ ;; TODO: Use 'load-compiled'.
+ (for-each primitive-load '#$actions)))))
(define (gexps->activation-gexp gexps)
"Return a gexp that runs the activation script containing GEXPS."