From c2c32f865c61534b5ba68abea63e0f5a17a37dcb Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Fri, 31 Jul 2020 23:53:44 +0200 Subject: [PATCH] package/systemd: remove util-linux nologin dependency if the tool is not enabled, then configure /bin/false as fallback. Signed-off-by: Norbert Lange Signed-off-by: Thomas Petazzoni --- 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 223ab6e113..f21c8d32dd 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 247ead532b..4fcff90512 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -213,6 +213,12 @@ else SYSTEMD_CONF_OPTS += -Dblkid=false endif +ifeq ($(BR2_PACKAGE_UTIL_LINUX_NOLOGIN),y) +SYSTEMD_CONF_OPTS += -Dnologin-path=/sbin/nologin +else +SYSTEMD_CONF_OPTS += -Dnologin-path=/bin/false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_INITRD),y) SYSTEMD_CONF_OPTS += -Dinitrd=true else