From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id oBZUGPPpvWDU3AAAgWs5BA (envelope-from ) for ; Mon, 07 Jun 2021 11:42:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id IKGPE/PpvWCgIwAAbx9fmQ (envelope-from ) for ; Mon, 07 Jun 2021 09:42:11 +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 BD00315E50 for ; Mon, 7 Jun 2021 11:42:10 +0200 (CEST) Received: from localhost ([::1]:40224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqBlp-0004Sh-Gb for larch@yhetil.org; Mon, 07 Jun 2021 05:42:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqBli-0004RZ-Bd for guix-patches@gnu.org; Mon, 07 Jun 2021 05:42:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42935) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqBli-0002oo-55 for guix-patches@gnu.org; Mon, 07 Jun 2021 05:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lqBlh-0003o0-Ug for guix-patches@gnu.org; Mon, 07 Jun 2021 05:42:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48889] [PATCH 2/4] Ceph: patch rbd to use $PATH lookups for modprobe Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Jun 2021 09:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48889 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ryan Sundberg , 48889@debbugs.gnu.org Received: via spool by 48889-submit@debbugs.gnu.org id=B48889.162305886814559 (code B ref 48889); Mon, 07 Jun 2021 09:42:01 +0000 Received: (at 48889) by debbugs.gnu.org; 7 Jun 2021 09:41:08 +0000 Received: from localhost ([127.0.0.1]:54481 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqBkq-0003ml-5d for submit@debbugs.gnu.org; Mon, 07 Jun 2021 05:41:08 -0400 Received: from xavier.telenet-ops.be ([195.130.132.52]:51756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqBkk-0003m8-I8 for 48889@debbugs.gnu.org; Mon, 07 Jun 2021 05:41:06 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by xavier.telenet-ops.be with bizsmtp id E9h02500H0mfAB4019h0H6; Mon, 07 Jun 2021 11:41:00 +0200 Message-ID: From: Maxime Devos Date: Mon, 07 Jun 2021 11:40:59 +0200 In-Reply-To: <20210606185204.17617-2-ryan@arctype.co> References: <20210606185204.17617-1-ryan@arctype.co> <20210606185204.17617-2-ryan@arctype.co> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-qkx10WlImDFXtyt4ie1k" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623058860; bh=HsPMaILckFVvwg9JUN7CgfVtIGj5aLWLuFbkIBwaB2A=; h=Subject:From:To:Date:In-Reply-To:References; b=JtjqdTd+Ar4fFPCXwQA40xG7X7JM90XvjKsmnmdueFO0DWn0g0dNRIiTTeX6JdxTv O4JdVq3sRbLUayJOWFBv5DnvzOr1zufyoq7UF8dFD5+R2LT6uYxhrsS0s+n28Torri /PAVcnoeFEMJtIyfD/EmTlhntdkYV0Zp1axiSYLwBCv+rlR/gOOExzlNfggfVIUmrx sbm5g0tzBhxf5PgmYbLPu690tZxReNc9rZw1Qnd9jTL4Ln8vgOQ72ejr8N6wBDSDVK R6IM8pz20JBOrWtRi7e5/pakvI+pOXHjlG6J3o0Zo5fGY8E28Qo1ihM2RjIJmq0mDP 8ajLLPYRStR0g== 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1623058930; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=HsPMaILckFVvwg9JUN7CgfVtIGj5aLWLuFbkIBwaB2A=; b=JYJU715dfAJx3Hsu7utwsxH5KDgAX+seVjMO2f8rvQhMijk0Dx7P7RnzwVCcdq4q8LrQf4 ZJmqwDRxNRtfJ8QmFOGeiutqawQWxRVTMnVbH0UMwRupnpF/LZ1qsJI5UubYsQrbMexzLQ OP9FWyK1f5qRAlBgkrWbNF+UEN0Dpra0S0B5lA0HxbVzI646z+KeeKushd43AbiVlEM7W8 AiwBgV/MgfiPu0dbZE9gJ/y/NDQT4RDTbaejcDulgXY1oQ4IzTxIO7ehNIOBCkiEldRLvM DXatInxpkM26hl5ECNWnh2mSAT65pPipMo1lfzsA91hvT07M6o+PEwEDcKwvxA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1623058930; a=rsa-sha256; cv=none; b=ZZqI2affhqkdE8Ty8y3kC9G7IuCjzVbc/S6GXlvznUzk6n3Yy9b/hfcQeIY+bHvZu/tB65 UsQq40ZERbqDyafaak1OlJ5a8ZL9P43BS1YtB0PrzvYe1moB/MR9SjFatoQj8jGrMDzYxo LlvawvcHGbQGtnXD3z5pnE/FTK7MNmErRJ3qKl+Uui/Y9OCm36qBPXv1ziO2WkYxuJ9jW+ bTqkXFewhSHQIKCXThbYNIiOE5r2XbLQVtATNV7tBAX6QaA/fpggXmIBMuyyt/YNfkudZ4 xFx58nyz1r1kgBENjdngZGpFEaQBAjFn8a6o2sDyMopo9bvoVynKTxvN+O3gqA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=JtjqdTd+; 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: -2.42 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=JtjqdTd+; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); 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: BD00315E50 X-Spam-Score: -2.42 X-Migadu-Scanner: scn1.migadu.com X-TUID: g1Vmfwcz2jAk --=-qkx10WlImDFXtyt4ie1k Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Ryan Sundberg via Guix-patches via schreef op zo 06-06-2021 om 11:52 [-0700= ]: > Removes hardcoded paths assumed in /sbin and /bin compiled into the > `rbd` tool. >=20 > Patch originally discussed at https://github.com/ceph/ceph/pull/20938 > and rejected by upstream for ambiguous security concerns related to > relative paths. > --- > .../patches/ceph-relative-paths.patch | 22 +++++++++++++++++++ > gnu/packages/storage.scm | 2 +- > 2 files changed, 23 insertions(+), 1 deletion(-) > create mode 100644 gnu/packages/patches/ceph-relative-paths.patch >=20 > diff --git a/gnu/packages/patches/ceph-relative-paths.patch b/gnu/package= s/patches/ceph-relative-paths.patch > new file mode 100644 > index 0000000000..e1b1d3599f > --- /dev/null > +++ b/gnu/packages/patches/ceph-relative-paths.patch > @@ -0,0 +1,22 @@ > +diff --git a/src/common/module.c b/src/common/module.c > +index f19f74324c..53355b8185 100644 > +--- a/src/common/module.c > ++++ b/src/common/module.c > +@@ -66,7 +66,7 @@ int module_has_param(const char *module, const char *p= aram) > + char command[128]; > +=20 > + snprintf(command, sizeof(command), > +- "/sbin/modinfo -F parm %s | /bin/grep -q ^%s:", > ++ "modinfo -F parm %s | grep -q ^%s:", modinfo is not necessarily in the profile. I'd recommend using substitute* from a build phase to replace /sbin/modinfo with the appropriate /gnu/store path. ((string-append (assoc-ref inputs "???") "/sbin/modinfo") or something like that, were you'll need to replace "???") > +- snprintf(command, sizeof(command), "/sbin/modprobe %s %s", > ++ snprintf(command, sizeof(command), "modprobe %s %s", > + module, (options ? options : "")); Likewise. Greetings, Maxime. --=-qkx10WlImDFXtyt4ie1k Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYL3prBccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7qdpAQCk3YWvoRgiWH0OwYgPtRrv1gSk UEFjwdHwxn7+VpGC3gEA+NdZ567jcb/wuiG6e3kN5dxib7UE1eIredi6tMpueAs= =YRN8 -----END PGP SIGNATURE----- --=-qkx10WlImDFXtyt4ie1k--