Skip to content

wait for /dnsmasq.pid #80

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

Open
robertkirkman wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −9
Open

wait for /dnsmasq.pid #80

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ SHELL ["sh", "-c"]
# so this odd-looking script forces the update process
# to work using the -s argument of toybox-su instead, which is working.
RUN sh -T /dev/ptmx -c "$TERMUX__PREFIX/bin/dnsmasq -u root -g root --pid-file=/dnsmasq.pid" && \
sleep 1 && \
echo '#!/system/bin/sh' > /update.sh && \
echo "PATH=$TERMUX__PREFIX/bin" >> /update.sh && \
echo 'while [ ! -f /dnsmasq.pid ]; do' >> /update.sh && \
echo 'sleep 1' >> /update.sh && \
echo 'done' >> /update.sh && \
echo "source $TERMUX__PREFIX/bin/termux-setup-package-manager" >> /update.sh && \
echo 'if [ "$TERMUX_APP_PACKAGE_MANAGER" = "apt" ]; then' >> /update.sh && \
echo 'apt update' >> /update.sh && \
Expand Down
9 changes: 5 additions & 4 deletions entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ if [ "$(id -u)" != "0" ]; then
fi

if [ -z "$(pidof dnsmasq)" ]; then
rm -f /dnsmasq.pid
/system/bin/sh -T /dev/ptmx -c "dnsmasq -u root -g root --pid-file=/dnsmasq.pid" >/dev/null 2>&1
sleep 1
if [ -z "$(pidof dnsmasq)" ]; then
echo "[!] Failed to start dnsmasq, host name resolution may fail." >&2
fi
fi

while [ ! -f /dnsmasq.pid ]; do
sleep 1
done

exec /system/bin/su -s "$PREFIX/bin/env" system -- \
-i \
ANDROID_DATA="$ANDROID_DATA" \
Expand Down
9 changes: 5 additions & 4 deletions entrypoint_root.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ if [ "$(id -u)" != "0" ]; then
fi

if [ -z "$(pidof dnsmasq)" ]; then
rm -f /dnsmasq.pid
/system/bin/sh -T /dev/ptmx -c "dnsmasq -u root -g root --pid-file=/dnsmasq.pid" >/dev/null 2>&1
sleep 1
if [ -z "$(pidof dnsmasq)" ]; then
echo "[!] Failed to start dnsmasq, host name resolution may fail." >&2
fi
fi

while [ ! -f /dnsmasq.pid ]; do
sleep 1
done

exec "$@"
Loading