bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some more postinst brokenness

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@4645 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2006-08-23 22:05:22 +00:00
parent b398acb8c7
commit 6e1983d551
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/atftp/Makefile
View File

@ -42,12 +42,12 @@ endef
define Package/atftpd/postinst
#!/bin/sh
grep -q '^tftp[[:space:]]*69/tcp' ${IPKG_INSTROOT}/etc/services 2>/dev/null
if [ $? -ne 0 ]; then
echo "tftp 69/tcp" >>${IPKG_INSTROOT}/etc/services
echo "tftp 69/udp" >>${IPKG_INSTROOT}/etc/services
echo "tftp-mcast 1758/tcp" >>${IPKG_INSTROOT}/etc/services
echo "tftp-mcast 1758/udp" >>${IPKG_INSTROOT}/etc/services
grep -q '^tftp[[:space:]]*69/tcp' $${IPKG_INSTROOT}/etc/services 2>/dev/null
if [ $$? -ne 0 ]; then
echo "tftp 69/tcp" >>$${IPKG_INSTROOT}/etc/services
echo "tftp 69/udp" >>$${IPKG_INSTROOT}/etc/services
echo "tftp-mcast 1758/tcp" >>$${IPKG_INSTROOT}/etc/services
echo "tftp-mcast 1758/udp" >>$${IPKG_INSTROOT}/etc/services
fi
endef

16
net/tor/Makefile
View File

@ -50,10 +50,10 @@ id=52
# do not change below
# # check if we are on real system
# if [ -z "${IPKG_INSTROOT}" ]; then
# 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
rootfs=`mount |awk '/root/ { print $$5 }'`
if [ "$$rootfs" = "squashfs" ]; then
if [ -h /etc/group ]; then
rm /etc/group
cp /rom/etc/group /etc/group
@ -66,14 +66,14 @@ id=52
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
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
if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then
echo "adding user $name to /etc/passwd"
echo "${name}:x:${id}:${id}:${name}:/tmp/.${name}:/bin/false" >> ${IPKG_INSTROOT}/etc/passwd
echo "$${name}:x:$${id}:$${id}:$${name}:/tmp/.$${name}:/bin/false" >> $${IPKG_INSTROOT}/etc/passwd
fi
endef