Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

archlinux fix #71

Merged
merged 1 commit into from
Jun 25, 2020
Merged

archlinux fix #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion usr/sbin/orjail
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,6 @@ if ! ip netns list | eno grep \\b"$NAME"\\b; then
print G " * Tor version is $TORVERSION"

TORCONFIGFILE=$(mktemp /tmp/torXXXXXX)
chown "$USERNAME" "$TORCONFIGFILE"
if [ "$HOSTTORRC" = "y" ] && [ -f /etc/tor/torrc ]; then
echo '%include /etc/tor/torrc' >> "$TORCONFIGFILE"
fi
Expand All @@ -581,6 +580,10 @@ EOF
echo "HiddenServiceVersion 3" >> "$TORCONFIGFILE";
echo "HiddenServicePort $HSERVICEPORT $IPNETNS:$HSERVICEPORT"; } >> "$TORCONFIGFILE"
fi

# this chown causes issues in archlinux where tmpfs seems to be protected...
# so call this only after the config file is ready. see PR#71
chown "$USERNAME" "$TORCONFIGFILE"

# reuse tor host's cache
if [ -d "/var/lib/tor" ]; then
Expand Down