Patchwork [30/30] shadow-utils-native: remove unnecessary alternatives

login
mail settings
Submitter Mark Hatle
Date May 22, 2012, 7:30 p.m.
Message ID <3a7cbde0116d961c444a80ecb7e2624e6cc61acd.1337714416.git.mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/28283/
State Accepted
Commit b1ea93143a473f006b31ab22f88baf41661971a7
Headers show

Comments

Mark Hatle - May 22, 2012, 7:30 p.m.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 .../shadow/shadow-native_4.1.4.3.bb                |   21 --------------------
 1 files changed, 0 insertions(+), 21 deletions(-)

Patch

diff --git a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
index 38bb922..5d9907b 100644
--- a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
@@ -43,25 +43,4 @@  do_install_append() {
 	# Now we don't have a mail system. Disable mail creation for now.
 	sed -i 's:/bin/bash:/bin/sh:g' ${D}${sysconfdir}/default/useradd
 	sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd
-
-	install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} 
-	for i in passwd chfn newgrp chsh ; do
-		mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}
-	done
-
-	mv ${D}${sbindir}/chpasswd ${D}${sbindir}/chpasswd.${PN}
-}
-
-pkg_postinst_${PN} () {
-	update-alternatives --install ${bindir}/passwd passwd passwd.${PN} 200
-	update-alternatives --install ${sbindir}/chpasswd chpasswd chpasswd.${PN} 200
-	update-alternatives --install ${bindir}/chfn chfn chfn.${PN} 200
-	update-alternatives --install ${bindir}/newgrp newgrp newgrp.${PN} 200
-	update-alternatives --install ${bindir}/chsh chsh chsh.${PN} 200
-}
-
-pkg_prerm_${PN} () {
-	for i in passwd chpasswd chfn newgrp chsh ; do
-		update-alternatives --remove $i $i.${PN}
-	done
 }