all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / Atom feed
* [bug#52062] [PATCH] gnu: system: Make old-style swap use default flags
@ 2021-11-23 17:56 Josselin Poiret via Guix-patches via
  2021-11-23 18:08 ` bug#52062: " Josselin Poiret via Guix-patches via
  0 siblings, 1 reply; 3+ messages in thread
From: Josselin Poiret via Guix-patches via @ 2021-11-23 17:56 UTC (permalink / raw)
  To: 52062; +Cc: Josselin Poiret

* 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





^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#52062: [PATCH] gnu: system: Make old-style swap use default flags
  2021-11-23 17:56 [bug#52062] [PATCH] gnu: system: Make old-style swap use default flags Josselin Poiret via Guix-patches via
@ 2021-11-23 18:08 ` Josselin Poiret via Guix-patches via
  2021-11-23 19:51   ` [bug#52062] " Tobias Geerinckx-Rice via Guix-patches via
  0 siblings, 1 reply; 3+ messages in thread
From: Josselin Poiret via Guix-patches via @ 2021-11-23 18:08 UTC (permalink / raw)
  Cc: dev, 52062-done

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




^ permalink raw reply	[flat|nested] 3+ messages in thread

* [bug#52062] [PATCH] gnu: system: Make old-style swap use default flags
  2021-11-23 18:08 ` bug#52062: " Josselin Poiret via Guix-patches via
@ 2021-11-23 19:51   ` Tobias Geerinckx-Rice via Guix-patches via
  0 siblings, 0 replies; 3+ messages in thread
From: Tobias Geerinckx-Rice via Guix-patches via @ 2021-11-23 19:51 UTC (permalink / raw)
  To: Josselin Poiret; +Cc: 52062-done, 52062

[-- Attachment #1: Type: text/plain, Size: 273 bytes --]

Josselin Poiret via Guix-patches via 写道:
> Sorry for this omission, I wonder how that got past my tests. 
> Maybe
> `guix system vm` removes swap-devices?

More: 
https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/system/vm.scm#n647

Kind regards,

T G-R

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-11-23 19:52 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-23 17:56 [bug#52062] [PATCH] gnu: system: Make old-style swap use default flags Josselin Poiret via Guix-patches via
2021-11-23 18:08 ` bug#52062: " Josselin Poiret via Guix-patches via
2021-11-23 19:51   ` [bug#52062] " Tobias Geerinckx-Rice via Guix-patches via

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.