diff options
| author |   Amarnath Valluri <amarnath.valluri@intel.com> | 2017-01-24 16:07:20 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-21 22:43:01 +0000 |
| commit | 07d6d0fb4dc689008bb0022d7d2ecc890c9159e5 (patch) | |
| tree | c174e633d350e37c7270413b980be6513fe25ee4 /meta/recipes-extended/shadow | |
| parent | ebf5cc1a6fecb0761fd88e113fac785b49bc1a45 (diff) | |
| download | openembedded-core-07d6d0fb4dc689008bb0022d7d2ecc890c9159e5.tar.gz | |
util-linux,shadow: Make 'nologin' alternative command
Both shadow and util-linux packages provides 'nologin' binary in ${base_sbindir}
and ${sbindir} respectively, this leads to conflict when 'usrmerge' feature is
enabled, where ${sbindir} == ${base_sbindir}. Hance, handle this to alternative
system to resolve the conflict.
Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
Diffstat (limited to 'meta/recipes-extended/shadow')
| -rw-r--r-- | meta/recipes-extended/shadow/shadow.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 25283a9741..70ff68ee87 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -172,10 +172,11 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "200" -ALTERNATIVE_${PN} = "passwd chfn chsh chpasswd vipw vigr" +ALTERNATIVE_${PN} = "passwd chfn chsh chpasswd vipw vigr nologin" ALTERNATIVE_LINK_NAME[chpasswd] = "${sbindir}/chpasswd" ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" +ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" ALTERNATIVE_${PN}-base = "newgrp groups login su" ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" |