From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from eddie.linux-mips.org ([148.251.95.138] helo=cvs.linux-mips.org) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1jBhKf-0003XD-HS for ptxdist@pengutronix.de; Tue, 10 Mar 2020 17:02:13 +0100 Received: (from localhost user: 'ladis' uid#1021 fake: STDIN (ladis@eddie.linux-mips.org)) by eddie.linux-mips.org id S23991437AbgCJQCNSSbV- (ORCPT ); Tue, 10 Mar 2020 17:02:13 +0100 Date: Tue, 10 Mar 2020 17:02:11 +0100 From: Ladislav Michl Message-ID: <20200310160211.GB1293144@lenoch> MIME-Version: 1.0 Content-Disposition: inline Subject: [ptxdist] [PATCH] util-linux: optionally install sulogin List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Signed-off-by: Ladislav Michl --- rules/util-linux-ng.in | 11 +++++++++++ rules/util-linux-ng.make | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in index 1e59c0787..a9735e13c 100644 --- a/rules/util-linux-ng.in +++ b/rules/util-linux-ng.in @@ -483,4 +483,15 @@ comment "BusyBox' login is selected!" comment "Shadow package is selected!" depends on SHADOW +config UTIL_LINUX_NG_SULOGIN + bool + depends on !BUSYBOX_SULOGIN || ALLYES + prompt "sulogin" + help + sulogin is invoked by init when the system goes into + single-user mode. + +comment "BusyBox' sulogin is selected!" + depends on BUSYBOX_SULOGIN + endif diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make index 81fd9c66d..88abca85f 100644 --- a/rules/util-linux-ng.make +++ b/rules/util-linux-ng.make @@ -119,7 +119,7 @@ UTIL_LINUX_NG_CONF_OPT := \ --disable-login-chown-vcs \ --disable-login-stat-mail \ --disable-nologin \ - --disable-sulogin \ + --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_SULOGIN)-sulogin \ --disable-su \ --disable-runuser \ --disable-ul \ @@ -321,6 +321,9 @@ endif ifdef PTXCONF_UTIL_LINUX_NG_LOGIN @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/login) endif +ifdef PTXCONF_UTIL_LINUX_NG_SULOGIN + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/sulogin) +endif @$(call install_finish, util-linux-ng) -- 2.25.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de