Subject: bug#52062: closed (Re: [PATCH] gnu: system: Make old-style swap use default flags)

From: [email-masked] (GNU bug Tracking System)
Date: Tue, 23 Nov 2021 18:09:02 +0000

Your bug report

#52062: [PATCH] gnu: system: Make old-style swap use default flags

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
52062: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=52062
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [PATCH] gnu: system: Make old-style swap use default flags
From: Josselin Poiret <[email-masked]>
Cc: [email-masked], [email-masked]
Date: Tue, 23 Nov 2021 18:08:46 +0000
List-Id: <debbugs-submit.debbugs.gnu.org>

Pushed as d48b404cf577cbfcd29b294e193a4db0c3e580b1 by Tobias.

Sorry for this omission, I wonder how that got past my tests.  Maybe
`guix system vm` removes swap-devices?

Best,
Josselin Poiret

Subject: [PATCH] gnu: system: Make old-style swap use default flags
From: Josselin Poiret <[email-masked]>
To: [email-masked]
Cc: Josselin Poiret <[email-masked]>
Date: Tue, 23 Nov 2021 17:56:46 +0000
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/services/base.scm (swap-service-type): Fix it.
---
 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 20736eb13f..ba01f5d764 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -2225,8 +2225,10 @@ (define device-lookup
                      (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))
-- 
2.33.1