Use ALTERNATIVES to manage 'nologin'
cover Use ALTERNATIVES to manage 'nologin'
The following changes since commit e7b731a1a358e0007dba1038ad504888bec5916e:
docbook-xsl-stylesheets: fix do_configure typo (2014-11-12 15:36:14 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib ChenQi/alternatives-nologin
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/alternatives-nologin
Chen Qi (2):
util-linux: use ALTERNATIVE mechanism to manage 'nologin'
shadow: use ALTERNATIVE to manage 'nologin'
meta/recipes-core/util-linux/util-linux.inc | 3 ++- meta/recipes-extended/shadow/shadow.inc | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-)
Signature · 1 line
1.9.1
PATCH 1/2 util-linux: use ALTERNATIVE mechanism to manage 'nologin'
Both shadow and util-linux provide 'nologin' command, so use the ALTERNATIVE mechanism in OE to manage it.
--- meta/recipes-core/util-linux/util-linux.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-core/util-linux/util-linux.inc +2 -1
@@ -169,7 +169,7 @@ ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root" ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" -ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject getopt sulogin" +ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject getopt sulogin nologin" ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
@@ -181,6 +181,7 @@ ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" +ALTERNATIVE_LINK_NAME[nologin] = "${sbindir}/nologin" ALTERNATIVE_TARGET[getopt] = "${bindir}/getopt" ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1 reset.1"
Signature · 1 line
1.9.1
PATCH 2/2 shadow: use ALTERNATIVE to manage 'nologin'
In reply to Chen QiBoth util-linux and shadow provide 'nologin', so use the ALTERNATIVE mechanism in OE to manage it.
--- meta/recipes-extended/shadow/shadow.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
meta/recipes-extended/shadow/shadow.inc +6 -1
@@ -146,18 +146,23 @@ do_install_append() { # Handle link properly after rename, otherwise missing files would # lead rpm failed dependencies. ln -sf newgrp.${BPN} ${D}${bindir}/sg + + # mv nologin to nologin.${BPN} + mv ${D}${base_sbindir}/nologin ${D}${base_sbindir}/nologin.${BPN} } inherit update-alternatives ALTERNATIVE_PRIORITY = "200" -ALTERNATIVE_${PN} = "passwd chfn newgrp chsh groups chpasswd login vipw vigr su" +ALTERNATIVE_${PN} = "passwd chfn newgrp chsh groups chpasswd login vipw vigr su nologin" ALTERNATIVE_LINK_NAME[chpasswd] = "${sbindir}/chpasswd" ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" +ALTERNATIVE_LINK_NAME[nologin] = "${sbindir}/nologin" +ALTERNATIVE_TARGET[nologin] = "${base_sbindir}/nologin.${BPN}" ALTERNATIVE_${PN}-doc = "passwd.5 getspnam.3" ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5"
Signature · 1 line
1.9.1
Quoted 4 lines · Chen Qi
Chen Qi (2):
util-linux: use ALTERNATIVE mechanism to manage 'nologin'
shadow: use ALTERNATIVE to manage 'nologin'
util-linux has been changed since this was sent, can you rebase please?
Cheers,
Ross
Quoted 8 lines · Ross
On 14 November 2014 08:35, Chen Qi <[email protected] <mailto:[email protected]>> wrote:
Chen Qi (2):
util-linux: use ALTERNATIVE mechanism to manage 'nologin'
shadow: use ALTERNATIVE to manage 'nologin'
Quoted 4 lines
util-linux has been changed since this was sent, can you rebase please?
Cheers,
Ross
OK. I'll send out V2.
Best Regards,
Chen Qi