webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-23 17:32:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into temp-c164-development

Browse Source
This commit is contained in:
Peter Müller
2022-01-30 13:18:50 +00:00
parent 37a9a0ba03 6b184642d2
commit bc176927e4
8 changed files with 112 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/initscripts/system/leds
View File

@@ -121,11 +121,16 @@ case "${1}" in
setup_netdev_trigger nanopi-r1:green:wan ${RED_DEV} tx rx
setup_netdev_trigger nanopi-r1:green:lan ${GREEN_DEV} tx rx
# Nanopi R1 start
# Nanopi R2S start
setup_heartbeat_trigger nanopi-r2s:red:sys
setup_netdev_trigger nanopi-r2s:green:wan ${RED_DEV} tx rx
setup_netdev_trigger nanopi-r2s:green:lan ${GREEN_DEV} tx rx
# Nanopi R4S start
setup_heartbeat_trigger nanopi-r4s:green:sys
setup_netdev_trigger nanopi-r4s:green:wan ${RED_DEV} tx rx
setup_netdev_trigger nanopi-r4s:green:lan ${GREEN_DEV} tx rx
exit 0
;;
@@ -166,6 +171,12 @@ case "${1}" in
disable_led_trigger nanopi-r2s:green:wan
disable_led_trigger nanopi-r2s:green:lan
# Nanopi R4S stop
disable_led_trigger nanopi-r4s:green:sys
enable_led nanopi-r4s:green:sys
disable_led_trigger nanopi-r4s:green:wan
disable_led_trigger nanopi-r4s:green:lan
exit 0
;;

18
src/initscripts/system/partresize
View File

@@ -51,17 +51,29 @@ case "${1}" in
scon="on"
fi
# Install AP6112 wlan config on NanoPi R1
mount /boot > /dev/null
case "$(< /proc/device-tree/model )" in
"FriendlyElec NanoPi-R1")
"FriendlyElec NanoPi-R1" )
# Install AP6112 wlan config on NanoPi R1
cp -f /lib/firmware/brcm/brcmfmac43430-sdio.AP6212.txt \
/lib/firmware/brcm/brcmfmac43430-sdio.txt
cp -f /lib/firmware/brcm/brcmfmac43430a0-sdio.ONDA-V80_PLUS.txt \
/lib/firmware/brcm/brcmfmac43430a0-sdio.txt
;;
"FriendlyElec NanoPi R2*" )
# Generate MAC address at first boot
SWMAC=`printf "%1x2:%02x:%02x:%02x:%02x" $[RANDOM%16] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256]`
echo ethaddr=$SWMAC:00 >> /boot/uEnv.txt
echo eth1addr=$SWMAC:01 >> /boot/uEnv.txt
;;
"FriendlyElec NanoPi R4S" )
# Generate MAC address at first boot
SWMAC=`printf "%1x2:%02x:%02x:%02x:%02x" $[RANDOM%16] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256]`
echo ethaddr=$SWMAC:00 >> /boot/uEnv.txt
echo eth1addr=$SWMAC:01 >> /boot/uEnv.txt
;;
esac 2>/dev/null
mount /boot > /dev/null
if [ -e /boot/grub/grub.cfg ]; then
# swtich permanent to serial console if it was selected on first boot
if [ "${scon}" = "on" ]; then