You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
998 B
26 lines
998 B
6 years ago
|
From 99ed45c2181819be473ae275bbf88df556cdff1c Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Brian C. Lane" <bcl@redhat.com>
|
||
|
|
Date: Wed, 5 Feb 2014 12:10:39 -0800
|
||
|
|
Subject: [PATCH] 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.
|
||
|
|
---
|
||
|
|
modules.d/95nfs/nfs-lib.sh | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/modules.d/95nfs/nfs-lib.sh b/modules.d/95nfs/nfs-lib.sh
|
||
|
|
index f5fc56d7..9ced2e69 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%%:*}
|
||
|
|
}
|
||
|
|
|