From patchwork Tue Feb 5 10:23:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1036603 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="dgAY3OSH"; 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 43v0zl3LxLz9sMl for ; Tue, 5 Feb 2019 21:24:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0E101877F7; Tue, 5 Feb 2019 10:24:01 +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 wxbKq2E1+jEL; Tue, 5 Feb 2019 10:24:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E3044879AD; Tue, 5 Feb 2019 10:23:59 +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 055AB1BF283 for ; Tue, 5 Feb 2019 10:23:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 02124877F7 for ; Tue, 5 Feb 2019 10:23:58 +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 icFyTHOU8Tw8 for ; Tue, 5 Feb 2019 10:23:56 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8EF5187075 for ; Tue, 5 Feb 2019 10:23:56 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id t27so2972645wra.6 for ; Tue, 05 Feb 2019 02:23:56 -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=E/oom2BQC8R9jNKaR3VFiwJgImn8G74Asyk58hK8rcI=; b=dgAY3OSHs1Pku4aXUixtrspryco8UoKU5dLpAd+2DFkm9MRmfQ6vtKPKKzJVKt1xWs J3Vl3mP8DthFyi7IN2Y2GjG6v296AcUvG1FlE74eFRWQDMisTF/ivArsWF2WhJyF07jp GjviCtwv2INVjfjk3I4hSg0H1ienhUiOfTGU8= 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=E/oom2BQC8R9jNKaR3VFiwJgImn8G74Asyk58hK8rcI=; b=pZL4nAWiXmoX7yRVqWqfgKOl7RJiXPTo7X6p4LKMrR5HJ0mDE5k/Pp72QHYcqFtKfX flk2T8DfZcXalriyNkkb+eX7qCz/O523AO41l/eK0bGltd7Jt9rL3VkYnjeTsN4zT/7Z AS1VhPq2QM4S2IQumGRbZkTUPVhIhTMfieZ21jf16mM+uVB3qZUSVBrY8oDydh/v/oOA LKsyR95KLjPqgXhL/RnvN+rNbfRrqP+vc1HGgRf8Kf6WXIHvBcoCE/Ib1Xowkc1amYxe /oVULrEDcVRUVoFqhAN/9T2eyD/z7UsOvk3/uKE4jaa9HSFYrP0KRXtEp39mgP+HWM9a hHdg== X-Gm-Message-State: AHQUAubw3yBrEWPQjms0k0yebC8PSdJ9cqT4JhCiA5W9788r9Ltz8gHL XBj84gZFQK5FVStEg1zl8NzXsUdwnJuyPg== X-Google-Smtp-Source: AHgI3IbByoPmQfFkNHIcAbVBysUbZ/6sA8rzmGFgUjPYuOepSOv2tyfOFP0q5lRAD00vMF/lXQY05A== X-Received: by 2002:adf:f3ce:: with SMTP id g14mr1480155wrp.73.1549362234528; Tue, 05 Feb 2019 02:23:54 -0800 (PST) Received: from localhost.localdomain ([2620:0:1055:fd00:3c25:d51f:f59f:7d82]) by smtp.gmail.com with ESMTPSA id c9sm7069736wrs.84.2019.02.05.02.23.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Feb 2019 02:23:53 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 5 Feb 2019 11:23:44 +0100 Message-Id: <1549362228-5731-2-git-send-email-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1549362228-5731-1-git-send-email-angelo@amarulasolutions.com> References: <1549362228-5731-1-git-send-email-angelo@amarulasolutions.com> Subject: [Buildroot] [PATCH v2 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 Acked-by: --- 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..3203df8 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