diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2013-07-26 20:09:09 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-31 06:59:58 +0100 |
commit | 9ed0a318b6f11849f54a632ac49d9f69c026d1c6 (patch) | |
tree | 4aa99eee7890f028907ad4e0fa9117bfb9c8117e /meta/recipes-extended/shadow | |
parent | b33626429d54fc2df866230f08c0f4d2e7ec4c04 (diff) | |
download | poky-9ed0a318b6f11849f54a632ac49d9f69c026d1c6.tar.gz |
shadow: use u-a for su
Use alternatives mechanism to prevent confliction of attempted
installing su binary among busybox, shadow and util-linux.
[YOCTO #4926]
(From OE-Core rev: 8d509edcd874e8d43b6fb6c4701c450edbbdef87)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/shadow')
-rw-r--r-- | meta/recipes-extended/shadow/shadow_4.1.4.3.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb index caf24c06af..173da3b0f0 100644 --- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb +++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb | |||
@@ -119,11 +119,12 @@ inherit update-alternatives | |||
119 | 119 | ||
120 | ALTERNATIVE_PRIORITY = "200" | 120 | ALTERNATIVE_PRIORITY = "200" |
121 | 121 | ||
122 | ALTERNATIVE_${PN} = "passwd chfn newgrp chsh groups chpasswd login vipw vigr" | 122 | ALTERNATIVE_${PN} = "passwd chfn newgrp chsh groups chpasswd login vipw vigr su" |
123 | ALTERNATIVE_LINK_NAME[chpasswd] = "${sbindir}/chpasswd" | 123 | ALTERNATIVE_LINK_NAME[chpasswd] = "${sbindir}/chpasswd" |
124 | ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" | 124 | ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" |
125 | ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" | 125 | ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" |
126 | ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" | 126 | ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" |
127 | ALTERNATIVE_LINK_NAME[su] = "${bindir}/su" | ||
127 | 128 | ||
128 | pkg_postinst_${PN} () { | 129 | pkg_postinst_${PN} () { |
129 | if [ "x$D" != "x" ]; then | 130 | if [ "x$D" != "x" ]; then |