From patchwork Sun Nov 3 16:56:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsOpbXkgUk9TRU4=?= X-Patchwork-Id: 1188594 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="EDdvhz2c"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 475htb1c16z9sP3 for ; Mon, 4 Nov 2019 03:57:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 11B4D8A5C5; Sun, 3 Nov 2019 16:57:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id s824twMIRtuB; Sun, 3 Nov 2019 16:57:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1C00289C0C; Sun, 3 Nov 2019 16:57:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id D9D0B1BF398 for ; Sun, 3 Nov 2019 16:57:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D4E1E21553 for ; Sun, 3 Nov 2019 16:57:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lTI5pIcfc7lq for ; Sun, 3 Nov 2019 16:57:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by silver.osuosl.org (Postfix) with ESMTPS id D6166204E9 for ; Sun, 3 Nov 2019 16:57:06 +0000 (UTC) Received: by mail-wr1-f53.google.com with SMTP id o28so14416397wro.7 for ; Sun, 03 Nov 2019 08:57:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NAfy6OzO8RywPzloqPZkKRMkj40QFgl+TUfNVSKsF/0=; b=EDdvhz2cE47LenoQCjU5V7wdrRr5h61niXjLKKiFdqd6F4cMaFDqNIFUJmK2SXR1si OiroQwPWpzHYOASJ54BoXkG2W9/dCtrQAr+K47A+WdDdYTyLXGZQDjrmJ177kn/1MEgO qtR/OdykUlftIblKLaAETXt5StcIGP5HajAAw+8iMRXyS/VolZz+CArQ2RQM2SvU6nwH S8jpQHlXFv87hF37G/qNuiDVThytBkksOaWcFcDrtG2cEafFZrIlIKeRQA28DERWSEr1 afdVdQUpgBD3xsF6cEhuCgq254d11jnLrkRomW/UdIHdBCFwrCLQ1W4O5Xgdzp7VvC6M GVaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NAfy6OzO8RywPzloqPZkKRMkj40QFgl+TUfNVSKsF/0=; b=jGv5FyJojvUItT7vlAJNOVeuyBXLTh2+QU1l/JjQNXkdnFToIzh7aefsMM2QDr6/7y NvM8ljRKwFjovURA/jCcIcnow73JqZjm+oEJIjOIRaoVXBN9hLikTjdnQ9wSfUnr6AOP jf0U3BkKaxNf9gQRAEqkaNnGSsqdTN+wwu2X+hwYKZcK/3ZfApfn1XwcMk4LfrfyhwV1 OGOTMrnlA7QKWSXYOCs/6387IAakt+6sDAeKvu/JgAz9uCz4Cle46I9k3M7wPk3XsE+h neDggSJi1xSqvT86HD803uN+jnz5OnRAfvvFwVKI6DKfxGh4XTKrG143tEcbUbw6Q1g4 MEgg== X-Gm-Message-State: APjAAAUV30TgWiYZUtBJoP+KSbH8sZC7F7pXA/bt+3y3wKUPhm/B299q 1Co7jJ2tuV0Yd/oY0PXWuX2i7fDXZg== X-Google-Smtp-Source: APXvYqyND5abDMurUVd8ebsavntiEA0HAtlkpFCYzH4t0ZERzb4RWsEpwftHQbkoLtwk7ViI0lV82g== X-Received: by 2002:a5d:6203:: with SMTP id y3mr19828389wru.142.1572800225195; Sun, 03 Nov 2019 08:57:05 -0800 (PST) Received: from localhost.localdomain (221.86.207.77.rev.sfr.net. [77.207.86.221]) by smtp.googlemail.com with ESMTPSA id 14sm1850430wrc.65.2019.11.03.08.57.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 08:57:04 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sun, 3 Nov 2019 17:56:35 +0100 Message-Id: <20191103165640.21819-11-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0.rc1 In-Reply-To: <20191103165640.21819-1-jeremy.rosen@smile.fr> References: <20191103165640.21819-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 10/15] package/docker-engine: adapt to preset-all X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" docker-engine has two services: * docker.service, if enabled: docker will start at boot * docker.socket, if enabled: docker will start at first connection buildroot currently enables only the service this patch keeps it that way. Signed-off-by: Jérémy Rosen --- package/docker-engine/50-docker-engine.preset | 1 + package/docker-engine/docker-engine.mk | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 package/docker-engine/50-docker-engine.preset diff --git a/package/docker-engine/50-docker-engine.preset b/package/docker-engine/50-docker-engine.preset new file mode 100644 index 0000000000..0d8cf35345 --- /dev/null +++ b/package/docker-engine/50-docker-engine.preset @@ -0,0 +1 @@ +disable docker.socket diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 6a225ee5f0..8540cda9af 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -68,9 +68,8 @@ define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/docker.service $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.socket \ $(TARGET_DIR)/usr/lib/systemd/system/docker.socket - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ - ln -fs ../../../../usr/lib/systemd/system/docker.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/docker.service + $(INSTALL) -D -m 644 package/docker-engine/50-docker-engine.preset \ + $(TARGET_DIR)/usr/lib/systemd/system-preset/50-docker-engine.preset endef define DOCKER_ENGINE_INSTALL_INIT_SYSV