From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euQTh-0005Or-8M for guix-patches@gnu.org; Fri, 09 Mar 2018 17:27:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euQTe-0003Dx-49 for guix-patches@gnu.org; Fri, 09 Mar 2018 17:27:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:45004) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1euQTe-0003Ds-0M for guix-patches@gnu.org; Fri, 09 Mar 2018 17:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1euQTd-0003RK-ND for guix-patches@gnu.org; Fri, 09 Mar 2018 17:27:01 -0500 Subject: [bug#30604] [PATCH v9 7/7] linux-initrd: Use module-aliases->module-file-names, too. Resent-Message-ID: Date: Fri, 9 Mar 2018 23:26:50 +0100 From: Danny Milosavljevic Message-ID: <20180309232650.0f37fb89@scratchpost.org> In-Reply-To: <20180304010914.1322-8-dannym@scratchpost.org> References: <20180303135533.6112-1-dannym@scratchpost.org> <20180304010914.1322-1-dannym@scratchpost.org> <20180304010914.1322-8-dannym@scratchpost.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/Qg9Kzc.tiVe2MTnqVgF7R4i"; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30604@debbugs.gnu.org --Sig_/Qg9Kzc.tiVe2MTnqVgF7R4i Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Sun, 4 Mar 2018 02:09:14 +0100 Danny Milosavljevic wrote: > --- a/gnu/system/linux-initrd.scm > +++ b/gnu/system/linux-initrd.scm > @@ -161,17 +161,17 @@ the derivations referenced by EXP are automatically= copied to the initrd." > #:references-graphs `(("init-closure" ,init) > ("modprobe-closure" ,modprobe)= ))) > =20 > -(define (flat-linux-module-directory linux modules) > - "Return a flat directory containing the Linux kernel modules listed in > -MODULES and taken from LINUX." > +(define (flat-linux-module-directory linux aliases) > + "Return a flat directory containing the Linux kernel modules resolved = by > +ALIASES and taken from LINUX." ... > + (define (find-only-entry directory) > + (match (scandir directory) > + (("." ".." basename) > + (string-append directory "/" basename)))) Probably unsafe since the order is not guaranteed. --Sig_/Qg9Kzc.tiVe2MTnqVgF7R4i Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAlqjCioACgkQ5xo1VCww uqXOZQgAkZgLnU86tFzMFoHikvaAZ41DEtYdjK+787F90a0+RSvTIMDMpFXvL40K LjRBRv3k7Im8o/gw4v0h0Jx9DhfwKmL7zXOOFkaK4urXx80Gfp49kozLeAUJWutP LRt3kn4hqw8PQzT/nDW46jH9GnNUyCAk2sANoQQWOdk+LpBc1EHs4Z571y6rQDb8 i6x9Ui3CNvDHYXjWsRDRS1+EIZaKTNpeTbD9/iyZOLltD6CXR37/6vgPyKP/kqE9 RHtHdwyrl6MVfPuomee2iiqC5z1HT+EXWjevXXVkIvP1azIGwM2mWxpJLynDO5Ld 0KYbk0UMDZ3/HFCSbcoODoMwvFeNEA== =PIV0 -----END PGP SIGNATURE----- --Sig_/Qg9Kzc.tiVe2MTnqVgF7R4i--