forked from mirror/openwrt
49a0acb12c
The fs_wait_for_key function runs multiple background processes that all try to delete the same temporary file ($keypress_wait) when they exit. This creates a race condition where one process successfully deletes the file while others fail with ENOENT. Busybox rm only suppresses "file not found" errors during the initial lstat() check, not during the actual unlink() call. This causes error messages in the boot log even with rm -f: rm: can't remove '/tmp/tmp.hKjPDH': No such file or directory Fixed by redirecting stderr to /dev/null for rm calls in concurrent contexts. This change does not affect functionality and only avoids confusing log output during boot. Signed-off-by: Oliver Sedlbauer <os@dev.tdt.de> Link: https://github.com/openwrt/openwrt/pull/22079 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
105 lines
2.7 KiB
Text
105 lines
2.7 KiB
Text
# Copyright (C) 2006-2010 OpenWrt.org
|
|
# Copyright (C) 2010 Vertical Communications
|
|
|
|
fs_wait_for_key () {
|
|
local timeout=$3
|
|
local timer
|
|
local do_keypress
|
|
local keypress_true="$(mktemp)"
|
|
local keypress_wait="$(mktemp)"
|
|
local keypress_sec="$(mktemp)"
|
|
if [ -z "$keypress_wait" ]; then
|
|
keypress_wait=/tmp/.keypress_wait
|
|
touch $keypress_wait
|
|
fi
|
|
if [ -z "$keypress_true" ]; then
|
|
keypress_true=/tmp/.keypress_true
|
|
touch $keypress_true
|
|
fi
|
|
if [ -z "$keypress_sec" ]; then
|
|
keypress_sec=/tmp/.keypress_sec
|
|
touch $keypress_sec
|
|
fi
|
|
|
|
trap "echo 'true' >$keypress_true; lock -u $keypress_wait ; rm -f $keypress_wait 2>/dev/null" INT
|
|
trap "echo 'true' >$keypress_true; lock -u $keypress_wait ; rm -f $keypress_wait 2>/dev/null" USR1
|
|
|
|
[ -n "$timeout" ] || timeout=1
|
|
[ $timeout -ge 1 ] || timeout=1
|
|
timer=$timeout
|
|
lock $keypress_wait
|
|
{
|
|
while [ $timer -gt 0 ]; do
|
|
pi_failsafe_net_message=true \
|
|
preinit_net_echo "Please press button now to enter failsafe"
|
|
echo "$timer" >$keypress_sec
|
|
timer=$(($timer - 1))
|
|
sleep 1
|
|
done
|
|
lock -u $keypress_wait
|
|
rm -f $keypress_wait 2>/dev/null
|
|
} &
|
|
|
|
local consoles="$(cat /sys/class/tty/console/active)"
|
|
[ -n "$consoles" ] || consoles=console
|
|
for console in $consoles; do
|
|
[ -c "/dev/$console" ] || continue
|
|
[ "$pi_preinit_no_failsafe" != "y" ] && echo "Press the [$1] key and hit [enter] $2" > "/dev/$console"
|
|
echo "Press the [1], [2], [3] or [4] key and hit [enter] to select the debug level" > "/dev/$console"
|
|
{
|
|
while [ -r $keypress_wait ]; do
|
|
timer="$(cat $keypress_sec)"
|
|
|
|
[ -n "$timer" ] || timer=1
|
|
timer="${timer%%\ *}"
|
|
[ $timer -ge 1 ] || timer=1
|
|
do_keypress=""
|
|
{
|
|
read -t "$timer" do_keypress < "/dev/$console"
|
|
case "$do_keypress" in
|
|
$1)
|
|
echo "true" >$keypress_true
|
|
;;
|
|
1 | 2 | 3 | 4)
|
|
echo "$do_keypress" >/tmp/debug_level
|
|
;;
|
|
*)
|
|
continue;
|
|
;;
|
|
esac
|
|
lock -u $keypress_wait
|
|
rm -f $keypress_wait 2>/dev/null
|
|
}
|
|
done
|
|
} &
|
|
done
|
|
lock -w $keypress_wait
|
|
|
|
keypressed=1
|
|
[ "$(cat $keypress_true)" = "true" ] && keypressed=0
|
|
|
|
trap - INT
|
|
trap - USR1
|
|
|
|
rm -f $keypress_true
|
|
rm -f $keypress_wait
|
|
rm -f $keypress_sec
|
|
|
|
return $keypressed
|
|
}
|
|
|
|
failsafe_wait() {
|
|
FAILSAFE=
|
|
[ "$pi_preinit_no_failsafe" = "y" ] && {
|
|
fs_wait_for_key "" "" $fs_failsafe_wait_timeout
|
|
return
|
|
}
|
|
grep -q 'failsafe=' /proc/cmdline && FAILSAFE=true && export FAILSAFE
|
|
if [ "$FAILSAFE" != "true" ]; then
|
|
fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true
|
|
[ -f "/tmp/failsafe_button" ] && FAILSAFE=true && echo "- failsafe button "$(cat /tmp/failsafe_button)" was pressed -"
|
|
[ "$FAILSAFE" = "true" ] && export FAILSAFE && touch /tmp/failsafe
|
|
fi
|
|
}
|
|
|
|
boot_hook_add preinit_main failsafe_wait
|