From 6da2ee08a667dcd40f85e6295ef364f0509b2ad8 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Tue, 30 Jun 2009 18:03:16 -0400 Subject: [PATCH] NFS empty path becomes "/tftpboot/%s" only if root=/dev/nfs legacy mode --- modules.d/95nfs/nfsroot | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules.d/95nfs/nfsroot b/modules.d/95nfs/nfsroot index a12c2fb78..0da8ee322 100755 --- a/modules.d/95nfs/nfsroot +++ b/modules.d/95nfs/nfsroot @@ -79,9 +79,8 @@ root_to_var $root #already takes care of nfs:... formatted root-path [ -z "$path" ] && root_to_var $nfs:$new_root_path -#Empty path defaults to "/tftpboot/%s" -# FIXME: This should happen only in nfsroot.txt legacy mode -[ -z "$path" ] && path="/tftpboot/%s" +#Empty path defaults to "/tftpboot/%s" only in nfsroot.txt legacy mode +[ -z "$path" ] && [ "$(getarg root=)" = "/dev/nfs" ] && path="/tftpboot/%s" if [ -z "$server" ] ; then # XXX new_dhcp_next_server is unconfirmed this is an assumption -- 2.47.3