diff options
| author | Jonathan Bauer | 2021-08-13 16:51:12 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2021-08-13 16:51:12 +0200 |
| commit | 96cb85a8aff5df3ef5fdee3fd61bc27e0af0c9e3 (patch) | |
| tree | 26404030cde7ba252a7709c744c0133196418323 | |
| parent | [dnbd3-rootfs] fix missing break (diff) | |
| download | systemd-init-96cb85a8aff5df3ef5fdee3fd61bc27e0af0c9e3.tar.gz systemd-init-96cb85a8aff5df3ef5fdee3fd61bc27e0af0c9e3.tar.xz systemd-init-96cb85a8aff5df3ef5fdee3fd61bc27e0af0c9e3.zip | |
[slx-network] more work towards chaos
| -rwxr-xr-x | modules.d/slx-network/scripts/udhcpc-trigger.stage3 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/modules.d/slx-network/scripts/udhcpc-trigger.stage3 b/modules.d/slx-network/scripts/udhcpc-trigger.stage3 index 402670d0..5833c0b4 100755 --- a/modules.d/slx-network/scripts/udhcpc-trigger.stage3 +++ b/modules.d/slx-network/scripts/udhcpc-trigger.stage3 @@ -121,9 +121,14 @@ fi if [ -n "$hostname" ]; then if [ -n "$SLX_PXE_HOSTNAME" ] && [ "$hostname" != "$SLX_PXE_HOSTNAME" ]; then echo "KCL and DHCP hostnames differ... assuming some KCL hack." - echo "Prefering KCL: '$SLX_PXE_HOSTNAME'." + echo " -> Prefering KCL: '$SLX_PXE_HOSTNAME'." hostname="$SLX_PXE_HOSTNAME" fi + if [ -n "$fqdn_hostname" ] && [ "$hostname" != "$fqdn_hostname" ]; then + echo "DHCP hostname differs from DNS hostname." + echo " -> Prefering DNS: '$fqdn_hostname'." + hostname="$fqdn_hostname" + fi else echo "No hostname specified in DHCP, checking DNS record." # We ignore the corner case where DHCP didn't supply a hostname but @@ -140,6 +145,7 @@ else else # no fallback hostname from DNS, use IP address hostname="noname-${ip//./-}" + fqdn="${hostname}.invalid" fi if [ -n "$domain" ]; then fqdn="${hostname}.${domain%% *}" # in case domain is a list |