From patchwork Fri Jul 31 21:53:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1339629 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=PSHIEmII; 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 4BJLdx74YYz9sTm for ; Sat, 1 Aug 2020 07:54:13 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8AE9088855; Fri, 31 Jul 2020 21:54:09 +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 r0pf5m44Ttr4; Fri, 31 Jul 2020 21:54:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id F14C18885E; Fri, 31 Jul 2020 21:54:08 +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 842C11BF2CA for ; Fri, 31 Jul 2020 21:54:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 71A362157D for ; Fri, 31 Jul 2020 21:54:03 +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 M0whjTYd8lW3 for ; Fri, 31 Jul 2020 21:54:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by silver.osuosl.org (Postfix) with ESMTPS id 63A212152E for ; Fri, 31 Jul 2020 21:54:02 +0000 (UTC) Received: by mail-wr1-f49.google.com with SMTP id r4so26222649wrx.9 for ; Fri, 31 Jul 2020 14:54:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XJNgFdyDIZCzCJBlEeKw72T98utlVLA0t8Ry/62b3Sw=; b=PSHIEmIInch1LrOB+R83mEBqh2BCp42OFDMjZWx21ZWj+Iz+xa9efgCsVnpfzpiwG7 9mSyX/5B7rbz+iH+eoaOQYfiHR5AM+P3hJkCa6EWGy3BbHHE3ZWge//0XR360rOLd9Gd FQH0XwJ7qfDieM015sW0zcCMD6r8q6tpr9G8ATNlLJWM/bSWkN44TxBvzOjAUmSKYeJb 61mDIK4/xRfua26A0q+lUI+YBrfZTbqz1BJ79gbeNrFTeCKQjTws1dHG3ymAuME+8nPB u9LFHMAXYdoFR1ou8N4DF+f4TosZQvSCWYPt4k6zU501BI06+3GbSVIDwFHEvUSD8H+o +VXg== 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=XJNgFdyDIZCzCJBlEeKw72T98utlVLA0t8Ry/62b3Sw=; b=Qj+Uwk1srOD0XzIc5JCxR35OkPdDOBUBJKijplJHA0kaiwiTqVRzICzJ/tGlaeEBW4 L9VZ2WI+a0zCxlliUk5Pc5QdfpvU7XwH0q0qoGorUTMJgtefc2nZqGJWc3R3jYiws07W m/MTlasaqy2dRivX9JnlNWPv8eBu3SbHEoKMI84dyRkctaDHzERm3jxi+4IWe7ct4BSR YC29Qed3Lepy7VNz7UjgsnPCpmy6t83wTS8PSkQsNadud0CB0YbrFlOuAReFliCBfI1o cktS3xLtI+SMrhDbpZpHCWrge+aeRttlYlii9/5vFAeYIUBQn2yXbUcfoYB7LK9kkKaG Oo1w== X-Gm-Message-State: AOAM530WuSJyMBHjaOI7bRkyvlmO3BEncfnvGQUvvS7YpQEE03Zqp2ni 1j3vx2lqZVEGcl2w82n2ueOvonr4 X-Google-Smtp-Source: ABdhPJxj7VNgM6QI7yE/3KlcTfUflWp/lGlCVJvivfsidPlKgdIy0jO4qAmYCeE3WFEZF66vNN5ohg== X-Received: by 2002:adf:94a1:: with SMTP id 30mr4857601wrr.37.1596232440558; Fri, 31 Jul 2020 14:54:00 -0700 (PDT) Received: from localhost.localdomain (84-114-45-16.cable.dynamic.surfer.at. [84.114.45.16]) by smtp.gmail.com with ESMTPSA id i66sm14814391wma.35.2020.07.31.14.53.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2020 14:54:00 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Fri, 31 Jul 2020 23:53:44 +0200 Message-Id: <20200731215345.19212-5-nolange79@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200731215345.19212-1-nolange79@gmail.com> References: <20200731215345.19212-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 4/5] package/systemd: remove util-linux nologin dependency 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: Norbert Lange , "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" if the tool is not enabled, then configure /bin/false as fallback. Signed-off-by: Norbert Lange --- package/systemd/Config.in | 1 - package/systemd/systemd.mk | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index bea8aaa019..1c37a37789 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -31,7 +31,6 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_AGETTY select BR2_PACKAGE_UTIL_LINUX_MOUNT - select BR2_PACKAGE_UTIL_LINUX_NOLOGIN select BR2_PACKAGE_UTIL_LINUX_FSCK select BR2_PACKAGE_KMOD select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod-tools diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 00c18be210..ac03e16829 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -217,6 +217,12 @@ else SYSTEMD_CONF_OPTS += -Dblkid=false endif +ifeq ($(BR2_PACKAGE_UTIL_LINUX_NOLOGIN),y) +SYSTEMD_CONF_OPTS += -Dnologin-path=/usr/sbin/nologin +else +SYSTEMD_CONF_OPTS += -Dnologin-path=/bin/false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_INITRD),y) SYSTEMD_CONF_OPTS += -Dinitrd=true else