mirror of
https://github.com/koreader/koreader
synced 2024-11-10 01:10:34 +00:00
6e3a3e8069
* \o/ * Make sure the (debug) event log doesn't end up in the fd table of our child processes... Otherwise, it breaks USBMS. * Close suspicious fds in the Wi-Fi scripts To prevent any and all issues w/ USBMS down the road... * Minor USBMS UI tweaks * Always ask for confirmation to start on USBMS session on plug * Bump base https://github.com/koreader/koreader-base/pull/1161 https://github.com/koreader/koreader-base/pull/1162 https://github.com/koreader/koreader-base/pull/1163 https://github.com/koreader/koreader-base/pull/1165 https://github.com/koreader/koreader-base/pull/1167
25 lines
1003 B
Bash
Executable File
25 lines
1003 B
Bash
Executable File
#!/bin/sh
|
|
|
|
# NOTE: Close any non-standard fds, so that it doesn't come back to bite us in the ass with USBMS later...
|
|
for fd in /proc/"$$"/fd/*; do
|
|
fd_id="$(basename "${fd}")"
|
|
if [ -e "${fd}" ] && [ "${fd_id}" -gt 2 ]; then
|
|
# NOTE: dash (meaning, in turn, busybox's ash, uses fd 10+ open to /dev/tty or $0 (w/ CLOEXEC))
|
|
fd_path="$(readlink -f "${fd}")"
|
|
if [ "${fd_path}" != "/dev/tty" ] && [ "${fd_path}" != "$(readlink -f "${0}")" ] && [ "${fd}" != "${fd_path}" ]; then
|
|
eval "exec ${fd_id}>&-"
|
|
echo "[obtain-ip.sh] Closed fd ${fd_id} -> ${fd_path}"
|
|
fi
|
|
fi
|
|
done
|
|
|
|
./release-ip.sh
|
|
|
|
# NOTE: Prefer dhcpcd over udhcpc if available. That's what Nickel uses,
|
|
# and udhcpc appears to trip some insanely wonky corner cases on current FW (#6421)
|
|
if [ -x "/sbin/dhcpcd" ]; then
|
|
env -u LD_LIBRARY_PATH dhcpcd -d -t 30 -w "${INTERFACE}"
|
|
else
|
|
env -u LD_LIBRARY_PATH udhcpc -S -i "${INTERFACE}" -s /etc/udhcpc.d/default.script -b -q
|
|
fi
|