From: nbd Date: Fri, 15 Apr 2011 00:43:03 +0000 (+0000) Subject: prosody: do not chown on the host system X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=c1b01ab41a1c687cbc8826f0f5876174a44270ad;p=packages.git prosody: do not chown on the host system git-svn-id: svn://svn.openwrt.org/openwrt/packages@26675 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/net/prosody/Makefile b/net/prosody/Makefile index 69ac767e8..4c1214c23 100644 --- a/net/prosody/Makefile +++ b/net/prosody/Makefile @@ -95,31 +95,31 @@ shell=/bin/false # do not change below # check if we are on real system if [ -z "$${IPKG_INSTROOT}" ]; then - # create copies of passwd and group, if we use squashfs - rootfs=`mount |awk '/root/ { print $$5 }'` - if [ "$$rootfs" = "squashfs" ]; then - if [ -h /etc/group ]; then - rm /etc/group - cp -p /rom/etc/group /etc/group - fi - if [ -h /etc/passwd ]; then - rm /etc/passwd - cp -p /rom/etc/passwd /etc/passwd - fi - fi + # create copies of passwd and group, if we use squashfs + rootfs=`mount |awk '/root/ { print $$5 }'` + if [ "$$rootfs" = "squashfs" ]; then + if [ -h /etc/group ]; then + rm /etc/group + cp -p /rom/etc/group /etc/group + fi + if [ -h /etc/passwd ]; then + rm /etc/passwd + cp -p /rom/etc/passwd /etc/passwd + fi + fi + + echo "" + if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then + echo "adding group $$name to /etc/group" + echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group + fi + if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then + echo "adding user $$name to /etc/passwd" + echo "$${name}:x:$${id}:$${id}:$${name}:$${home}:$${shell}" >> $${IPKG_INSTROOT}/etc/passwd + fi + + chown -R $${name}:$${name} $${IPKG_INSTROOT}/etc/prosody fi - -echo "" -if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then - echo "adding group $$name to /etc/group" - echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group -fi -if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then - echo "adding user $$name to /etc/passwd" - echo "$${name}:x:$${id}:$${id}:$${name}:$${home}:$${shell}" >> $${IPKG_INSTROOT}/etc/passwd -fi - -chown -R $${name}:$${name} $${IPKG_INSTROOT}/etc/prosody endef $(eval $(call BuildPackage,prosody))