diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/tor/files | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/tor/files')
| -rw-r--r-- | package/tor/files/tor.conffiles | 1 | ||||
| -rw-r--r-- | package/tor/files/tor.init | 4 | ||||
| -rw-r--r-- | package/tor/files/tor.postinst | 24 |
3 files changed, 28 insertions, 1 deletions
diff --git a/package/tor/files/tor.conffiles b/package/tor/files/tor.conffiles new file mode 100644 index 000000000..2954287e6 --- /dev/null +++ b/package/tor/files/tor.conffiles @@ -0,0 +1 @@ +/etc/tor/torrc diff --git a/package/tor/files/tor.init b/package/tor/files/tor.init index e8804bb64..dd3759252 100644 --- a/package/tor/files/tor.init +++ b/package/tor/files/tor.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 80 +#PKG tor +#INIT 80 + . /etc/rc.conf case $1 in diff --git a/package/tor/files/tor.postinst b/package/tor/files/tor.postinst new file mode 100644 index 000000000..9ca10117b --- /dev/null +++ b/package/tor/files/tor.postinst @@ -0,0 +1,24 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf tor tor NO + +# 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 /rom/etc/group /etc/group + fi + if [ -h /etc/passwd ]; then + rm /etc/passwd + cp /rom/etc/passwd /etc/passwd + fi + fi +fi + +gid=$(get_next_gid) +add_group tor $gid +add_user tor $(get_next_uid) $gid /tmp/.tor |