aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-10-30 15:38:31 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-10-30 16:02:03 +0200
commit54063cb976b06b50d0303e7ee71106d5aa45a338 (patch)
tree169509eeab803b969b74d5407d94ce33257b9ecf
parent36abd163b39fb75e116898f92ea39fa332ce6694 (diff)
downloadopenembedded-54063cb976b06b50d0303e7ee71106d5aa45a338.tar.gz
openembedded-54063cb976b06b50d0303e7ee71106d5aa45a338.tar.bz2
openembedded-54063cb976b06b50d0303e7ee71106d5aa45a338.zip
shadow: use u-a for groups (conflicts with groups from coreutils-8.5)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes/shadow/shadow.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/recipes/shadow/shadow.inc b/recipes/shadow/shadow.inc
index f1476b7b85..1b105c556c 100644
--- a/recipes/shadow/shadow.inc
+++ b/recipes/shadow/shadow.inc
@@ -13,7 +13,7 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
-INC_PR = "r17"
+INC_PR = "r18"
# Additional Policy files for PAM
PAM_SRC_URI = " \
@@ -57,7 +57,7 @@ CFLAGS += "-I../include"
PACKAGES =+ "${PN}-group"
RDEPENDS_${PN} += "${PN}-group"
-FILES_${PN}-group = "${bindir}/gpasswd ${bindir}/newgrp.shadow ${bindir}/sg ${bindir}/groups"
+FILES_${PN}-group = "${bindir}/gpasswd ${bindir}/newgrp.shadow ${bindir}/sg ${bindir}/groups.shadow"
do_configure_prepend () {
export CONFIG_SITE="${CONFIG_SITE} ${B}/cachedpaths"
@@ -100,7 +100,7 @@ do_install_append() {
sed -i 's/MAIL_CHECK_ENAB/#MAIL_CHECK_ENAB/g' ${D}${sysconfdir}/login.defs
install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir}
- for i in passwd chfn newgrp chsh ; do
+ for i in passwd chfn newgrp groups chsh ; do
mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}
done
@@ -145,9 +145,11 @@ pkg_prerm_${PN} () {
pkg_postinst_${PN}-group () {
touch /etc/login.defs
update-alternatives --install ${bindir}/newgrp newgrp newgrp.${PN} 200
+ update-alternatives --install ${bindir}/groups groups groups.${PN} 200
}
pkg_prerm_${PN}-group () {
update-alternatives --remove newgrp newgrp.${PN}
+ update-alternatives --remove groups groups.${PN}
}