package/systemd: remove util-linux nologin dependency

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

Signed-off-by: Norbert Lange <nolange79@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 223ab6e1132a44fb0ef1179b89b99f0a9ab19db4..f21c8d32ddf2dd4ffa6d4417968d4bc737b09ffa 100644 (file)
--- 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 247ead532be82fea7951717c899731ff0aaf63e0..4fcff905125708fd7ed70a00b68271b5375ccc63 100644 (file)
--- 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