From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mGh7Bl0tnWEAPAEAgWs5BA (envelope-from ) for ; Tue, 23 Nov 2021 19:05:17 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id EIoiAl0tnWElGQAAB5/wlQ (envelope-from ) for ; Tue, 23 Nov 2021 18:05:17 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C97349601 for ; Tue, 23 Nov 2021 19:05:16 +0100 (CET) Received: from localhost ([::1]:53774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpaAN-0000qt-Tl for larch@yhetil.org; Tue, 23 Nov 2021 13:05:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpa3P-0003vv-0W for guix-patches@gnu.org; Tue, 23 Nov 2021 12:58:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40670) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpa3O-0007c3-OZ for guix-patches@gnu.org; Tue, 23 Nov 2021 12:58:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpa3O-0006tS-Hp for guix-patches@gnu.org; Tue, 23 Nov 2021 12:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52062] [PATCH] gnu: system: Make old-style swap use default flags Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Nov 2021 17:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52062 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52062@debbugs.gnu.org Cc: Josselin Poiret X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163769024726443 (code B ref -1); Tue, 23 Nov 2021 17:58:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Nov 2021 17:57:27 +0000 Received: from localhost ([127.0.0.1]:52216 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpa2m-0006sL-7z for submit@debbugs.gnu.org; Tue, 23 Nov 2021 12:57:27 -0500 Received: from lists.gnu.org ([209.51.188.17]:34378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpa2h-0006s9-6s for submit@debbugs.gnu.org; Tue, 23 Nov 2021 12:57:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpa2g-000311-U7 for guix-patches@gnu.org; Tue, 23 Nov 2021 12:57:18 -0500 Received: from jpoiret.xyz ([206.189.101.64]:53782) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpa2e-0007XL-QT for guix-patches@gnu.org; Tue, 23 Nov 2021 12:57:18 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 3B94B184F27; Tue, 23 Nov 2021 17:57:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1637690232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=iP53gw8ylbrkzXZDEpSHhqNweZLMduk6uHqLE15pA9w=; b=T/Aak7rGRQlQ8j8T47hvtl0JAOQkPpBBgwZbtBj6d6dsxXVLrPJT0VPCKI1F2FdX+Rsgld sAVts0JrykvutA6s3ZetBSyBywOB2QiVVIF7EWRq7o23kfHszTQe0Tl3wm58GHvHUQOLQP A7qIp1fM2qQ23x5gWig8PM5WiMq1z/3/Kh3zjJ/hoRifE4o1d66JfasEoN4znZFoebVRHb CkjsElB9gBepfZXo57gMAjoowgWaHgUQr42PT6/c6UDWrqBIX6NBO0ynmcFIWF3+h0fDcz 0/Z9mLewaf/AHgYEKnwixg+HOvakA/WZmepBLW164BZ0jrQbOjIvqdEFJGZh6g== Date: Tue, 23 Nov 2021 17:56:46 +0000 Message-Id: <20211123175646.31930-1-dev@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: ++++ Received-SPF: pass client-ip=206.189.101.64; envelope-from=dev@jpoiret.xyz; helo=jpoiret.xyz X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.001, FROM_SUSPICIOUS_NTLD_FP=1.997, PDS_OTHER_BAD_TLD=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches From: Josselin Poiret via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1637690716; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=iP53gw8ylbrkzXZDEpSHhqNweZLMduk6uHqLE15pA9w=; b=pxS1arLx0F+G7hxZmxUgLJ85+9a1V5Y66ApUOyxHDJprka3Z6xp5y2N6E7a0ursLxMBKU6 Pfot1iAHDGuSMi265R7cj6EMPYOcHqIybhopiANbcqfZCSRiEr2yNAlCpqOyu6emygWeqc rpcLMeqNj7Le9kmXwGlQ3CIQzRErOz33mvlxyubyjkKb5dgWharv3Y9n1t/8XWhpTOtjaF BIIOzAWhVnMsgQWC1mw4POeuRA+0wwIArdiYK10aAFn8gwpIApljcAkeHHewQR8Lc/vwfj /UwheRYg2QfsrAGWCwF6eTJ/eVoQQ/J9T9JDSi12sBIz2mqdKj/hOGEaSO/qKw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1637690716; a=rsa-sha256; cv=none; b=RjaLekDLjXpbpOVOH6Rg2Jld+Kc3KwXJEKiloxOcChdbLfz5I1SiobCXYzg41HmL7xfd0D 01t9N7qMAuNb8ZeG75ZHnQRTnXlhhV7YiwVAklDcFrw37WFybmU6yp+zrnc53aMDJQY83I e7MWAKWG/wPiZgOl7y8FekYN+PsqAJGoLJnW6DJZkO7KmeLsOoihsDQv0QRs5w5g0bsTPd lS+xwQgUy72z3Is2rLQlMwRkFDqCKv17suf6sZgB+b8Fv96OSKAOGxnDQ5PaWkZfGoUqch +1OT61TJqFqhng13wnrxvB5scbEOFqYISTvJk9ym1pMfoSvpBdvtLpMa8rYCyg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b="T/Aak7rG"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 0.41 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b="T/Aak7rG"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C97349601 X-Spam-Score: 0.41 X-Migadu-Scanner: scn1.migadu.com X-TUID: ODuYlBzevILb * 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