Try static IP first, then DHCP
All checks were successful
buildbot/multibuild_parent Build done.
buildbot/travis_bionic Build done.
buildbot/ipxe_x86_build_and_release Build done.

This commit is contained in:
Peter Šurda 2024-02-20 12:57:30 +08:00
parent 632556590b
commit 9c7265e6d4
Signed by: PeterSurda
GPG Key ID: 3E47497CF67ABB95

View File

@ -74,6 +74,8 @@ iseq ${net${idx}/mac} 00:25:90:a9:73:76 && set ip-dev-name eno1 && set ip-addr 2
# backup.bitmessage.at
iseq ${net${idx}/mac} a8:a1:59:c7:21:8f && set ip-dev-name enp39s0 && set ip-addr 93.189.25.253 && set ip-gateway 93.189.25.249 && set ip-netmask 255.255.255.248 && set ip-dns 1.1.1.1 && set successful t && goto loop_done ||
iseq ${net${idx}/mac} a8:a1:59:c7:21:90 && set ip-dev-name enp38s0 && set ip-addr 93.189.25.253 && set ip-gateway 93.189.25.249 && set ip-netmask 255.255.255.248 && set ip-dns 1.1.1.1 && set successful t && goto loop_done ||
# test1.sysdeploy.org
iseq ${net${idx}/mac} 08:60:6e:e5:bb:20 && set ip-dev-name eth0 && set ip-addr 176.31.183.121 && set ip-gateway 176.31.183.254 && set ip-netmask 255.255.255.0 && set ip-dns 1.1.1.1 && set successful t && goto loop_done ||
@ -86,7 +88,7 @@ inc idx && goto loop
:loop_done
# If we have not successfully found a MAC match, then we error, because we
# also failed DHCP. So there's nothing we can do but fail.
iseq ${successful} f && goto error_handler ||
iseq ${successful} f && goto try_dhcp ||
# If on the other hand we're successful, then we construct the kernel ip= line
set ip-info ${ip-addr}::${ip-gateway}:${ip-netmask}::${ip-dev-name}:off:${ip-dns} && echo Static IP found
@ -180,23 +182,21 @@ goto start_arm64
:start_i386
goto start_amd64
:try_dhcp
dhcp || goto error_handler
sleep 1
set ip-info dhcp
goto boot_all
# Set arch info and determine if we can use DHCP for network.
# Then either boot or goto static IP setup.
:start_arm64
set arch-info arm64
dhcp || goto static_ip_boot_arm64
sleep 1
set ip-info dhcp
goto boot_all
goto static_ip_boot_arm64
:start_amd64
set arch-info amd64
dhcp || goto static_ip_boot_amd64
sleep 1
set ip-info dhcp
goto boot_all
goto static_ip_boot_amd64
# This process should be the same for arm and x86, but I'll leave this section
# intact in case it turns out it's not the same
@ -210,9 +210,6 @@ goto static_ip_boot_setup
:boot_all
# override
set dns 1.1.1.1
# Get accurate time for signature validation
echo Syncing time over NTP
ntp pool.ntp.org || echo "Skipped"