Changeset 03abecc in freewrt

Timestamp:

Aug 14, 2025, 4:59:15 AM (4 months ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_2_0

Children:

28ae594

Parents:

d860f20

Message:

fix failsafe mode, use modern buttons and leds support

Files:

• package/base-files/files/etc/preinit (modified) (1 diff)
• package/base-files/files/sbin/failsafe (modified) (1 diff)
• package/busybox/config/loginutils/Config.in (modified) (1 diff)
• target/linux/brcm-6.12/squashfs-overlay/config/config.squashfs_overlay (modified) (3 diffs)
• target/linux/brcm-6.12/squashfs-overlay/files/sbin/mount_root (modified) (1 diff)

package/base-files/files/etc/preinit

@@ -3 +3 @@
 mount none /proc -t proc
 mount none /sys -t sysfs
+mkdir -p /dev/pts
+mount none /dev/pts -t devpts
 [ -f /etc/preinit.arch ] && . /etc/preinit.arch
 failsafe || /bin/sh

package/base-files/files/sbin/failsafe

@@ -1 +1 @@
 #!/bin/sh
 
+# CONFIGURE
+EVENT_DEV="/dev/input/event0"    # change if your reset button is on a different event device
+KEY_CODE="KEY_RESTART"           # as reported by evtest
+LED_PATH="/sys/class/leds/bcm47xx:green:dmz"  # adjust to your LED name from ls /sys/class/leds
+FAILSAFE_IP="192.168.1.1"
+FAILSAFE_BCAST="192.168.1.255"
+
+# Bring up LAN
 ip link set up dev eth0
-ip addr add 192.168.1.1/24 broadcast 192.168.1.255 dev eth0
-netmsg 192.168.1.255 "Press reset now, to enter Failsafe!"
+ip addr add ${FAILSAFE_IP}/24 broadcast ${FAILSAFE_BCAST} dev eth0
+
+# Warn the user
+netmsg ${FAILSAFE_BCAST} "Press reset now, to enter Failsafe!"
 echo "Press reset now to enter Failsafe!"
-sleep 2
+sleep 2 &
 
-if [ $(cat /proc/sys/reset) = 1 ]; then
-        while :; do
-                echo $(((X=(X+1)%8)%2)) >/proc/sys/diag
-                sleep $((X==0))
-        done &
-        netmsg 192.168.1.255 "Entering Failsafe!"
-        telnetd 
-        exit 1
+# Check for reset press during the 2s window
+# We'll read the event stream for KEY_RESTART with value 1 (press)
+pressed=0
+timeout 2 sh -c "
+    evtest ${EVENT_DEV} 2>/dev/null | \
+    grep -m1 '${KEY_CODE}.*value 1' && exit 0 || exit 1
+"
+if [ $? -eq 0 ]; then
+    pressed=1
+fi
+
+if [ "$pressed" -eq 1 ]; then
+    # Blink LED in background
+    (
+        while :; do
+            echo 1 > ${LED_PATH}/brightness
+            sleep 0.5
+            echo 0 > ${LED_PATH}/brightness
+            sleep 0.5
+        done
+    ) &
+
+    netmsg ${FAILSAFE_BCAST} "Entering Failsafe!"
+    telnetd
+    exit 1
 else
-        ip addr flush dev eth0
+    ip addr flush dev eth0
 fi
+

package/busybox/config/loginutils/Config.in

@@ -102 +102 @@
 config BUSYBOX_CONFIG_LOGIN
         bool "login"
-        default n
+        default y
         select BUSYBOX_CONFIG_FEATURE_SUID
         help

target/linux/brcm-6.12/squashfs-overlay/config/config.squashfs_overlay

@@ -951 +951 @@
 CONFIG_PHYLIB=y
 CONFIG_SWPHY=y
+# CONFIG_LED_TRIGGER_PHY is not set
 CONFIG_FIXED_PHY=y
 
@@ -1046 +1047 @@
 #
 CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=y
 # CONFIG_INPUT_FF_MEMLESS is not set
 # CONFIG_INPUT_SPARSEKMAP is not set
@@ -1281 +1283 @@
 # CONFIG_MEMSTICK is not set
 CONFIG_LEDS_GPIO_REGISTER=y
-# CONFIG_NEW_LEDS is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_CLASS_FLASH is not set
+# CONFIG_LEDS_CLASS_MULTICOLOR is not set
+# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+
+#
+# LED drivers
+#
+CONFIG_LEDS_GPIO=y
+# CONFIG_LEDS_LT3593 is not set
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+# CONFIG_LEDS_MLXREG is not set
+# CONFIG_LEDS_USER is not set
+
+#
+# Flash and Torch LED drivers
+#
+
+#
+# RGB LED drivers
+#
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+# CONFIG_LEDS_TRIGGER_ONESHOT is not set
+# CONFIG_LEDS_TRIGGER_MTD is not set
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_CPU is not set
+# CONFIG_LEDS_TRIGGER_ACTIVITY is not set
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
+# CONFIG_LEDS_TRIGGER_CAMERA is not set
+# CONFIG_LEDS_TRIGGER_PANIC is not set
+# CONFIG_LEDS_TRIGGER_NETDEV is not set
+# CONFIG_LEDS_TRIGGER_PATTERN is not set
+# CONFIG_LEDS_TRIGGER_TTY is not set
+# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set
+
+#
+# Simple LED drivers
+#
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set

target/linux/brcm-6.12/squashfs-overlay/files/sbin/mount_root

@@ -2 +2 @@
 mount none /tmp -t tmpfs
 mount none /tmp -t tmpfs -o remount,nosuid,nodev,mode=1777
-mkdir -p /dev/pts
-mount none /dev/pts -t devpts