From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:34430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEap8-0004qv-Qa for guix-patches@gnu.org; Thu, 11 Apr 2019 10:37:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEap6-0005yn-L2 for guix-patches@gnu.org; Thu, 11 Apr 2019 10:37:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41462) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hEap4-0005xR-KN for guix-patches@gnu.org; Thu, 11 Apr 2019 10:37:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hEap4-0004Fh-FY for guix-patches@gnu.org; Thu, 11 Apr 2019 10:37:02 -0400 Subject: [bug#35229] [PATCH] gnu: docker: Check for error on XFRM. Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:34297) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEaod-0004eS-Ps for guix-patches@gnu.org; Thu, 11 Apr 2019 10:36:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEaoc-0005Zs-P8 for guix-patches@gnu.org; Thu, 11 Apr 2019 10:36:35 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:36514) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEaoc-0005YC-Hl for guix-patches@gnu.org; Thu, 11 Apr 2019 10:36:34 -0400 From: Danny Milosavljevic Date: Thu, 11 Apr 2019 16:36:28 +0200 Message-Id: <20190411143628.301-1-dannym@scratchpost.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: 35229@debbugs.gnu.org * gnu/packages/patches/docker-use-fewer-modprobes.patch: Check for error = on XFRM. --- .../patches/docker-use-fewer-modprobes.patch | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/gnu/packages/patches/docker-use-fewer-modprobes.patch b/gnu/= packages/patches/docker-use-fewer-modprobes.patch index 2779e1be5d..4e4a45b6ce 100644 --- a/gnu/packages/patches/docker-use-fewer-modprobes.patch +++ b/gnu/packages/patches/docker-use-fewer-modprobes.patch @@ -103,17 +103,35 @@ See . =20 --- docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/ns/init_= linux.go.orig 2019-03-19 11:23:20.738316699 +0100 +++ docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/ns/init_= linux.go 2019-03-19 11:27:57.149753073 +0100 -@@ -100,12 +100,7 @@ +@@ -76,12 +76,8 @@ func NlHandle() *netlink.Handle { + func getSupportedNlFamilies() []int { + fams :=3D []int{syscall.NETLINK_ROUTE} + // NETLINK_XFRM test +- if err :=3D loadXfrmModules(); err !=3D nil { +- if checkXfrmSocket() !=3D nil { +- logrus.Warnf("Could not load necessary modules for IPSEC rules: %v",= err) +- } else { +- fams =3D append(fams, syscall.NETLINK_XFRM) +- } ++ if err :=3D checkXfrmSocket(); err !=3D nil { ++ logrus.Warnf("Could not load necessary modules for IPSEC rules: %v", = err) + } else { + fams =3D append(fams, syscall.NETLINK_XFRM) + } +@@ -99,16 +95,6 @@ func getSupportedNlFamilies() []int { + return fams } =20 - func loadXfrmModules() error { +-func loadXfrmModules() error { - if out, err :=3D exec.Command("modprobe", "-va", "xfrm_user").Combined= Output(); err !=3D nil { - return fmt.Errorf("Running modprobe xfrm_user failed with message: `%= s`, error: %v", strings.TrimSpace(string(out)), err) - } - if out, err :=3D exec.Command("modprobe", "-va", "xfrm_algo").Combined= Output(); err !=3D nil { - return fmt.Errorf("Running modprobe xfrm_algo failed with message: `%= s`, error: %v", strings.TrimSpace(string(out)), err) - } -+ // Those are automatically loaded when someone opens the socket anyway= . - return nil - } -=20 +- return nil +-} +- + // API check on required xfrm modules (xfrm_user, xfrm_algo) + func checkXfrmSocket() error { + fd, err :=3D syscall.Socket(syscall.AF_NETLINK, syscall.SOCK_RAW, sysc= all.NETLINK_XFRM)