All of lore.kernel.org
 help / color / mirror / Atom feed
From: Norbert Lange <nolange79@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 4/5] package/systemd: remove util-linux nologin dependency
Date: Fri, 31 Jul 2020 23:53:44 +0200	[thread overview]
Message-ID: <20200731215345.19212-5-nolange79@gmail.com> (raw)
In-Reply-To: <20200731215345.19212-1-nolange79@gmail.com>

if the tool is not enabled, then configure /bin/false
as fallback.

Signed-off-by: Norbert Lange <nolange79@gmail.com>
---
 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
-- 
2.27.0

  parent reply	other threads:[~2020-07-31 21:53 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-31 21:53 [Buildroot] [PATCH 0/5] package/systemd: make a couple dependencies optional Norbert Lange
2020-07-31 21:53 ` [Buildroot] [PATCH 1/5] package/systemd: import does not need bzip2 and lz4 Norbert Lange
2020-08-05 13:51   ` Thomas Petazzoni
2020-07-31 21:53 ` [Buildroot] [PATCH 2/5] package/systemd: remove libblkid dependency Norbert Lange
2020-08-05 13:51   ` Thomas Petazzoni
2020-07-31 21:53 ` [Buildroot] [PATCH 3/5] package/systemd: remove util-linux binaries dependency Norbert Lange
2020-08-05 13:51   ` Thomas Petazzoni
2020-07-31 21:53 ` Norbert Lange [this message]
2020-08-05 13:52   ` [Buildroot] [PATCH 4/5] package/systemd: remove util-linux nologin dependency Thomas Petazzoni
2020-08-05 14:08     ` Norbert Lange
2020-07-31 21:53 ` [Buildroot] [PATCH 5/5] package/systemd: disable portabled Norbert Lange
2020-08-05 13:53   ` Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200731215345.19212-5-nolange79@gmail.com \
    --to=nolange79@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.