diff options
| author | Simon Rettberg | 2023-02-03 12:22:16 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2023-02-03 12:22:16 +0100 |
| commit | ea3f4ec5ac55cfa789510c7efe480edeba204c18 (patch) | |
| tree | 4f1b0b1405b6eeeda9ff962064311bd035f1452a /core/modules/slx-network-configs-targets | |
| parent | [hardware-stats] Get uptime when submitting report, not 5 hours earlier (diff) | |
| download | mltk-ea3f4ec5ac55cfa789510c7efe480edeba204c18.tar.gz mltk-ea3f4ec5ac55cfa789510c7efe480edeba204c18.tar.xz mltk-ea3f4ec5ac55cfa789510c7efe480edeba204c18.zip | |
[dhcpc-busybox] Don't wait for dhcp on br0 anymore
We did this to avoid issues if the hostname changes after Xorg
started up. But sometimes, DHCP is really slow, and we delay the
startup of the login screen by a good 10 seconds. Avoid this
by instead just touching the flag file that prevents the udhcpc
trigger script from changing the hostname. Running with a
potentially wrong hostname should be an acceptable tradeoff.
Diffstat (limited to 'core/modules/slx-network-configs-targets')
3 files changed, 0 insertions, 26 deletions
diff --git a/core/modules/slx-network-configs-targets/data/etc/systemd/system/network.target.wants/slx-wait-primary-dhcp.service b/core/modules/slx-network-configs-targets/data/etc/systemd/system/network.target.wants/slx-wait-primary-dhcp.service deleted file mode 120000 index e7f32c14..00000000 --- a/core/modules/slx-network-configs-targets/data/etc/systemd/system/network.target.wants/slx-wait-primary-dhcp.service +++ /dev/null @@ -1 +0,0 @@ -../slx-wait-primary-dhcp.service
\ No newline at end of file diff --git a/core/modules/slx-network-configs-targets/data/etc/systemd/system/slx-wait-primary-dhcp.service b/core/modules/slx-network-configs-targets/data/etc/systemd/system/slx-wait-primary-dhcp.service deleted file mode 100644 index 68dc13f7..00000000 --- a/core/modules/slx-network-configs-targets/data/etc/systemd/system/slx-wait-primary-dhcp.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Wait until DHCP for the primary NIC has finished -Before=network.target - -[Service] -Type=oneshot -ExecStart=/opt/openslx/scripts/systemd-wait_primary_dhcp diff --git a/core/modules/slx-network-configs-targets/data/opt/openslx/scripts/systemd-wait_primary_dhcp b/core/modules/slx-network-configs-targets/data/opt/openslx/scripts/systemd-wait_primary_dhcp deleted file mode 100755 index 3e452549..00000000 --- a/core/modules/slx-network-configs-targets/data/opt/openslx/scripts/systemd-wait_primary_dhcp +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/ash - -flag="/run/network/primary-dhcp.flag" -readonly flag -w=0 - -# Wait a maximum of 10 seconds for the flag file -while ! [ -e "$flag" ] && [ "$w" -lt 10 ]; do - let w++ - sleep 1 -done - -# Then touch it anyways, this will prevent the DHCP -# trigger script from changing the hostname later on -mkdir -p /run/network -touch "$flag" - -exit 0 |