branch master updated: gnu: system: Make old-style swap use default flags.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

nckx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new d48b404  gnu: system: Make old-style swap use default flags.
d48b404 is described below

commit d48b404cf577cbfcd29b294e193a4db0c3e580b1
Author: Josselin Poiret <dev@jpoiret.xyz>
AuthorDate: Tue Nov 23 17:56:46 2021 +0000

    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>
---
 gnu/services/base.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 20736eb..ba01f5d 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))