From af76a8ca775ba44815116ae880de56d7a8a03c97 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 12 Apr 2018 14:27:43 +0200 Subject: [PATCH] 95nfs: If no server is configured, read BOOTSERVERADDR from wicked's leaseinfo References: boo#1089332 --- modules.d/95nfs/nfs-lib.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules.d/95nfs/nfs-lib.sh b/modules.d/95nfs/nfs-lib.sh index 58aa7e30..b2e5f91d 100755 --- a/modules.d/95nfs/nfs-lib.sh +++ b/modules.d/95nfs/nfs-lib.sh @@ -106,7 +106,7 @@ anaconda_nfsv6_to_var() { # fill in missing server/path from DHCP options. nfsroot_from_dhcp() { local f - for f in /tmp/net.$1.override /tmp/dhclient.$1.dhcpopts; do + for f in /tmp/net.$1.override /tmp/dhclient.$1.dhcpopts /tmp/leaseinfo.$1.dhcp.*; do [ -f $f ] && . $f done [ -n "$new_root_path" ] && nfsroot_to_var "$nfs:$new_root_path" @@ -114,6 +114,7 @@ nfsroot_from_dhcp() { [ -z "$server" ] && server=$srv [ -z "$server" ] && server=$new_dhcp_server_identifier [ -z "$server" ] && server=$new_next_server + [ -z "$server" ] && server=$BOOTSERVERADDR [ -z "$server" ] && server=${new_root_path%%:*} } -- 2.13.6