From patchwork Tue Feb 5 09:43:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1036562 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="h8x+Bv9r"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43v0533SxYz9sMl for ; Tue, 5 Feb 2019 20:43:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A5C1E86F8A; Tue, 5 Feb 2019 09:43:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 40qp4b0hEPTn; Tue, 5 Feb 2019 09:43:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id B5C4C8721D; Tue, 5 Feb 2019 09:43:32 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id BFAD61BF283 for ; Tue, 5 Feb 2019 09:43:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BCD7A8721D for ; Tue, 5 Feb 2019 09:43:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AsAxoVG8yLxB for ; Tue, 5 Feb 2019 09:43:30 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 61C4386F8A for ; Tue, 5 Feb 2019 09:43:30 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id a62so2818725wmh.4 for ; Tue, 05 Feb 2019 01:43:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+72c0gLVXX2dP+TobBW9PLiy4g5f5azDM+x2f0MjKjk=; b=h8x+Bv9r1u86nClzuB53HOoPgMsGCGUm5JTSpW2JwwawWIbF8UCUeV3vMhrbep4kIf KUQrUT30b9Vt8pT0Z4/A8C9HYOpHQVc6yeEH88w1lsFEbvkuAh3l8aniQvGZ2ZKE6ii5 6E26GAdVh9tHXVqvsL2xvqd/V42Pt1l62AAbg= 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; bh=+72c0gLVXX2dP+TobBW9PLiy4g5f5azDM+x2f0MjKjk=; b=oWcYt4kXnetOyhuoEyzCh6BbeqvEUoX2Zm6tlW4+GfKOvWk+6h5W+OdUtxu+/4VIG7 D1aDUz7/0qcbQGoarrfygu48JCIKXHnv+8ZsUbjyZ9xtLZMY6lF4+pNbUM+bq/nQViKD nYlmkgyjtsA6c9eWw0LwvCDzDXCwRa12r0ZQ8NZln7OIULmVWtID5FYYJ4hvrUULw14Y mhA3KVkUgCNGJVh9L4DJMCoBRkkWgeTbY/pXqDQp4mju3JYMPlMBJ7zlun/6bv47/1gJ CjBsvFOLalFDE2Tkxq/UPteI8VqJyPzxdBR9DWYcKRp2eW1ydhU1HQCIDryDIG5RXskz RTOQ== X-Gm-Message-State: AHQUAuY4HuFBEVUEYIpat5qkJsy4nMYZqPsNBQSaf7s2eeiE3ibHcRr9 zh/0JsjkJtC9tdoRkl6zXStACEc6jV9Y5A== X-Google-Smtp-Source: AHgI3Ibou4oiTpa6V9+j3izqrrCAOS2w6Rc9NrULrnoYl7nB/2r4kz6lKqlDHAMbmH5kQprxClwisQ== X-Received: by 2002:a7b:c1d3:: with SMTP id a19mr3042160wmj.41.1549359808117; Tue, 05 Feb 2019 01:43:28 -0800 (PST) Received: from localhost.localdomain ([2620:0:1055:fd00:3c25:d51f:f59f:7d82]) by smtp.gmail.com with ESMTPSA id t199sm23172416wmt.1.2019.02.05.01.43.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Feb 2019 01:43:25 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 5 Feb 2019 10:43:09 +0100 Message-Id: <1549359793-12666-2-git-send-email-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1549359793-12666-1-git-send-email-angelo@amarulasolutions.com> References: <1549359793-12666-1-git-send-email-angelo@amarulasolutions.com> Subject: [Buildroot] [PATCH 1/5] package/mender: adding a writable location 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: Angelo Compagnucci MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Mender needs /var/lib/mender to be writable at the service start, the path is hardcoded and thus we cannot change it. This patch solves the problem using the same approach we have for dropbear. Signed-off-by: Angelo Compagnucci Reviewed-by: "Yann E. MORIN" --- package/mender/mender.mk | 2 ++ package/mender/mender.service | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/mender/mender.mk b/package/mender/mender.mk index a5cece7..1f66615 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -49,6 +49,8 @@ define MENDER_INSTALL_CONFIG_FILES $(INSTALL) -D -m 0755 $(@D)/support/mender-inventory-$(f) \ $(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-$(f) ) + + ln -snf /var/run/mender $(TARGET_DIR)/var/lib/mender endef MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILES diff --git a/package/mender/mender.service b/package/mender/mender.service index 9ede55a..8b60a4f 100644 --- a/package/mender/mender.service +++ b/package/mender/mender.service @@ -6,7 +6,17 @@ After=systemd-resolved.service Type=idle User=root Group=root -ExecStartPre=/bin/mkdir -p -m 0700 /data/mender +ExecStartPre=/bin/sh -c '\ +if [ -L /var/lib/mender \ + -a "$(readlink /var/lib/mender)" = "/var/run/mender" ]; then \ + if rm -f /var/lib/mender >/dev/null 2>&1; then \ + mkdir -p /var/lib/mender; \ + else \ + echo "No persistent location to store mender data. Data will be lost\ + echo "at reboot. Are you sure this is what you want to do?"; \ + mkdir -p "$(readlink /var/lib/mender)"; \ + fi; \ +fi' ExecStart=/usr/bin/mender -daemon Restart=on-abort