diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2014-11-21 14:30:57 +0800 |
|---|---|---|
| committer | Chen Qi <Qi.Chen@windriver.com> | 2014-11-21 15:04:16 +0800 |
| commit | eec4166509e494d1e0e6e36798eb4f5ebeec312f (patch) | |
| tree | 96e74741b682472fdf7e00acebf03ce78f353d65 | |
| parent | 4a888b2ab61662c7f749b5d1e64af92ed613d8eb (diff) | |
| download | openembedded-core-contrib-eec4166509e494d1e0e6e36798eb4f5ebeec312f.tar.gz | |
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.inc | 3 |
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 a37efe904e..1c45485a78 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -170,7 +170,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 sulogin" +ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject sulogin nologin" ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" @@ -181,6 +181,7 @@ ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" +ALTERNATIVE_LINK_NAME[nologin] = "${sbindir}/nologin" ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1 reset.1" |