Thanks, applied. Michael
[sent from post-receive hook] On Fri, 27 Mar 2020 10:52:11 +0100, Ladislav Michl <[email protected]> wrote: > Signed-off-by: Ladislav Michl <[email protected]> > --- > 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) > > _______________________________________________ ptxdist mailing list [email protected]
