diff options
| author | Simon Rettberg | 2022-05-23 15:19:05 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2022-05-23 15:19:30 +0200 |
| commit | 2166aa15ea56fa627bbe6bd020fc2fc1335a481c (patch) | |
| tree | c3a0fd22ffe464b4b726356ad5af16a9df0caa2d /modules.d/slx-network/scripts | |
| parent | config(.tgz): Increase retry timeout to 20 seconds, use --slx-time (diff) | |
| download | systemd-init-2166aa15ea56fa627bbe6bd020fc2fc1335a481c.tar.gz systemd-init-2166aa15ea56fa627bbe6bd020fc2fc1335a481c.tar.xz systemd-init-2166aa15ea56fa627bbe6bd020fc2fc1335a481c.zip | |
Merge DNS search list from DHCP and config server (SLX_NET_SEARCH)
Diffstat (limited to 'modules.d/slx-network/scripts')
| -rwxr-xr-x | modules.d/slx-network/scripts/udhcpc-trigger.stage3 | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/modules.d/slx-network/scripts/udhcpc-trigger.stage3 b/modules.d/slx-network/scripts/udhcpc-trigger.stage3 index 5833c0b4..82a21f6f 100755 --- a/modules.d/slx-network/scripts/udhcpc-trigger.stage3 +++ b/modules.d/slx-network/scripts/udhcpc-trigger.stage3 @@ -84,6 +84,12 @@ done # always check DNS echo "Checking DNS record for this host..." [ -z "$fqdn" ] && fqdn="$(reverse_lookup "$ip")" +[ -z "$fqdn" ] && [ -n "$hostname" ] && [ -n "$domain" ] && fqdn="${hostname}.${domain}" +# Otherwise, retry DNS one time +if [ -z "$fqdn" ]; then + sleep 1 + fqdn="$(reverse_lookup "$ip")" +fi [ -n "$fqdn" ] && fqdn_hostname="${fqdn%%.*}" if [ -z "$domain" ]; then @@ -105,16 +111,16 @@ fi # Write out if [ -n "$domain" ]; then echo "domain $domain" >> "/etc/resolv.conf" - echo "SLX_NET_DOMAIN='$domain'" >> "/run/openslx/network.conf" + echo "SLX_NET_DOMAIN='$domain'" >> "$NETWORK_CONF" fi if [ -n "$search" ]; then echo "search $search" >> "/etc/resolv.conf" - echo "SLX_NET_SEARCH='$search'" >> "/run/openslx/network.conf" + echo "SLX_NET_SEARCH='$search'" >> "$NETWORK_CONF" fi if [ -n "$ntpsrv" ]; then - echo "SLX_DHCP_NTP='$ntpsrv'" >> "/run/openslx/network.conf" + echo "SLX_DHCP_NTP='$ntpsrv'" >> "$NETWORK_CONF" fi # Hostname |