summary refs log tree commit diff
diff options
context:
space:
mode:
authorJosselin Poiret <dev@jpoiret.xyz>2021-11-23 17:56:46 +0000
committerTobias Geerinckx-Rice <me@tobias.gr>2021-11-23 19:02:34 +0100
commitd48b404cf577cbfcd29b294e193a4db0c3e580b1 (patch)
tree72b2def1b0358e1facb73cd5a29dff00bf0615b7
parent8452c5d1f44b6fb6456409d9c51a3a32a7860b9c (diff)
downloadguix-d48b404cf577cbfcd29b294e193a4db0c3e580b1.tar.gz
gnu: system: Make old-style swap use default flags.
* gnu/services/base.scm (swap-service-type): Use default flags (0) if
SWAP is not a new-style <swap-space> record.

Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
-rw-r--r--gnu/services/base.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 20736eb13f..ba01f5d764 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -2225,8 +2225,10 @@ instance."
                      (and device
                           (begin
                             (restart-on-EINTR (swapon device
-                                                      #$(swap-space->flags-bit-mask
-                                                         swap)))
+                                                      #$(if (swap-space? swap)
+                                                            (swap-space->flags-bit-mask
+                                                             swap)
+                                                            0)))
                             #t)))))
         (stop #~(lambda _
                   (let ((device #$device-lookup))