From patchwork Tue Feb 5 10:49:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1036615 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.136; helo=silver.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="Jqlyx82X"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43v1dc4YX1z9sMx for ; Tue, 5 Feb 2019 21:53:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D356330CA1; Tue, 5 Feb 2019 10:53:21 +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 ZDP36qCEf6WW; Tue, 5 Feb 2019 10:53:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id C3C54226AF; Tue, 5 Feb 2019 10:53:19 +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 7F8111BF95C for ; Tue, 5 Feb 2019 10:50:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7A2968739D for ; Tue, 5 Feb 2019 10:50:10 +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 5kIL4OnqmHWI for ; Tue, 5 Feb 2019 10:50:09 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 125D1879EE for ; Tue, 5 Feb 2019 10:50:09 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id z15so1021344wrn.1 for ; Tue, 05 Feb 2019 02:50:08 -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=nr1nHQB7TxAsZZKrD6mRO/I5Qw4koKu0NGN2Q3k46Og=; b=Jqlyx82Xnmqb+yl0bpfiPGB/aHinCVNMhlOmLLbMuOQ0pZIMMCoJoepbMlVRWDyQ/0 xsit6Zd8Gdmc9EGb9F6s8k7Gccmagfgxk+iMq9dRu0FpMNFZCgP7NLCSuYOdZ1/7OESl eHxTVYdqSeNx+nvtwqBmIP1Rb8V59d7ipH+DQ= 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=nr1nHQB7TxAsZZKrD6mRO/I5Qw4koKu0NGN2Q3k46Og=; b=QezHHJYRezEJgn/6WQgrU9yWOBkNf6d0U77E/5NCjeinzFswQtavdySFKW8v4z860D IuUBi4a77Lc8XOf7u+XA0Q2GODLrIIk3kFiVt/ZOdUx4VMl9SF8zwXmZpqyJSW5U+diB cm2BWhO7oNPoAR1Jel1ueasqv548Qfxs6xF9Sw4GbMGUzYMocBt9nMLJUXzzTgycktLI hsr+zrS6vcBxCU3zBDc2mYVwLPBeibuKh52SJrk5riJ8y9EA/sYgbUKEGwzuCsDO19mK XsX6pkQ2oJy7IjC0+xWhnDqv7XDJQwzjNUclSDV0ZfTwAv8QmpyniVFQXk/KwmW0oLRc zxBQ== X-Gm-Message-State: AHQUAubRzvOBJdmKNvE9dxM3cGtiSZgiLlH8jwTx7CJFbssYXmkPTHWm oDC0WYRuytZ4hB3P9kVKUhCneSBhYrBHFw== X-Google-Smtp-Source: AHgI3IbFNDF6AabrBb/BydQxDxSSFjNTimI9JhVvpSOpsRYGcovv9Y7AjsGZCM+MxdakDDUl+f2Yuw== X-Received: by 2002:a5d:4fcb:: with SMTP id h11mr3165220wrw.139.1549363807165; Tue, 05 Feb 2019 02:50:07 -0800 (PST) Received: from localhost.localdomain ([2620:0:1055:fd00:3c25:d51f:f59f:7d82]) by smtp.gmail.com with ESMTPSA id y138sm20114681wmc.16.2019.02.05.02.50.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Feb 2019 02:50:06 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 5 Feb 2019 11:49:55 +0100 Message-Id: <1549363799-30840-2-git-send-email-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1549363799-30840-1-git-send-email-angelo@amarulasolutions.com> References: <1549363799-30840-1-git-send-email-angelo@amarulasolutions.com> Subject: [Buildroot] [PATCH v3 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" 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