From: Brian C. Lane <bcl@redhat.com>
Date: Wed, 5 Feb 2014 20:10:39 +0000 (-0800)
Subject: new_dhcp_next_server is really new_next_server
X-Git-Tag: 037~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=460cddffa194d054cd499464410af00f3d037b9f;p=thirdparty%2Fdracut.git

new_dhcp_next_server is really new_next_server

The variable that dhclient sets doesn't have dhcp in the name. This
could cause problems with setups where the server is not the same as the
dhcp server.
---

diff --git a/modules.d/95nfs/nfs-lib.sh b/modules.d/95nfs/nfs-lib.sh
index f5fc56d71..9ced2e69f 100755
--- a/modules.d/95nfs/nfs-lib.sh
+++ b/modules.d/95nfs/nfs-lib.sh
@@ -97,7 +97,7 @@ nfsroot_from_dhcp() {
     [ -z "$path" ] && [ "$(getarg root=)" == "/dev/nfs" ] && path=/tftpboot/%s
     [ -z "$server" ] && server=$srv
     [ -z "$server" ] && server=$new_dhcp_server_identifier
-    [ -z "$server" ] && server=$new_dhcp_next_server
+    [ -z "$server" ] && server=$new_next_server
     [ -z "$server" ] && server=${new_root_path%%:*}
 }