Skip to content

Commit fcb959e

Browse files
schwar3katcoderabbitai[bot]
authored andcommitted
Modify radxa-e54c board config to fix leds, network and Gnome desktop init. (armbian#9111)
* Modify radxa-e54c board config to fix leds, network and Gnome Modify led setup section to use new led device names Add a keyfile /etc/NetworkManager/conf.d/99-unmanaged-devices.conf to set the internal ethernet, end1, used to connect to the internal switch chip to unmanaged. This interface doesn't accept dhcp IP addresses and Network Manager attempts to connect it via dhcp causing errors. A vendor kernel build with Gnome desktop attempts to use Wayland unsuccessfully causing the desktop to take over 10 minutes to initialise eventually using X11. Modify the board /usr/lib/armbian/armbian-firstlogin file to set WaylandEnable = false if the build is for a vendor kernel with a Gnome desktop. * Update config/boards/radxa-e54c.conf Tested the suggestion and it works. Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Removing the RedHat-specific plugin --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
1 parent f3974f2 commit fcb959e

File tree

1 file changed

+18
-4
lines changed

1 file changed

+18
-4
lines changed

config/boards/radxa-e54c.conf

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function post_family_tweaks_bsp__radxa_e54c_enable_leds() {
2121
link=1
2222
tx=0
2323
rx=1
24-
device_name=lan1@end1
24+
device_name=lan1
2525

2626
[/sys/class/leds/lan2-led]
2727
trigger=netdev
@@ -30,7 +30,7 @@ function post_family_tweaks_bsp__radxa_e54c_enable_leds() {
3030
link=1
3131
tx=0
3232
rx=1
33-
device_name=lan2@end1
33+
device_name=lan2
3434

3535
[/sys/class/leds/lan3-led]
3636
trigger=netdev
@@ -39,7 +39,7 @@ function post_family_tweaks_bsp__radxa_e54c_enable_leds() {
3939
link=1
4040
tx=0
4141
rx=1
42-
device_name=lan3@end1
42+
device_name=lan3
4343

4444
[/sys/class/leds/wan-led]
4545
trigger=netdev
@@ -48,7 +48,7 @@ function post_family_tweaks_bsp__radxa_e54c_enable_leds() {
4848
link=1
4949
tx=0
5050
rx=1
51-
device_name=wan@end1
51+
device_name=wan
5252

5353
[/sys/class/leds/mmc0::]
5454
trigger=mmc0
@@ -59,4 +59,18 @@ function post_family_tweaks_bsp__radxa_e54c_enable_leds() {
5959
brightness=0
6060
invert=0
6161
EOF
62+
63+
# Internal Ethernet interface can't get an IP address and shouldn't be managed by NetworkManager so make it unmanaged.
64+
display_alert "$BOARD" "Creating Board Support Internal Switch Config" "info"
65+
cat <<- EOF > "${destination}"/etc/NetworkManager/conf.d/99-unmanaged-devices.conf
66+
[main]
67+
68+
[keyfile]
69+
unmanaged-devices=interface-name:end1
70+
71+
EOF
72+
73+
if [[ $DESKTOP_ENVIRONMENT == gnome && $BRANCH == vendor ]]; then
74+
sed -i -e "/AutomaticLogin = \$RealUserName/a\\" -e $'\\t\\t\\tWaylandEnable = false' "${destination}"/usr/lib/armbian/armbian-firstlogin
75+
fi
6276
}

0 commit comments

Comments
 (0)