summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-11-14 16:10:59 +0800
committerChen Qi <Qi.Chen@windriver.com>2014-11-14 16:28:17 +0800
commit9cb8e916d701dab7ea9f2796621a94ba45029591 (patch)
treeb1f25c7e96a25cf8f022c0fa214f11af0ee24d46
parente7b731a1a358e0007dba1038ad504888bec5916e (diff)
downloadopenembedded-core-contrib-9cb8e916d701dab7ea9f2796621a94ba45029591.tar.gz
openembedded-core-contrib-9cb8e916d701dab7ea9f2796621a94ba45029591.tar.bz2
openembedded-core-contrib-9cb8e916d701dab7ea9f2796621a94ba45029591.zip
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. Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index ffb84c4b64..900d73b88e 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -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"