From: Harald Hoyer <harald@redhat.com>
Date: Wed, 15 Feb 2012 15:39:41 +0000 (+0100)
Subject: 95nfs/nfs-lib.sh: do not bail out at sourcing in nfsroot_from_dhcp()
X-Git-Tag: 016~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=969394f503e7a5e67576c4fa29e24229239a18de;p=thirdparty%2Fdracut.git

95nfs/nfs-lib.sh: do not bail out at sourcing in nfsroot_from_dhcp()

nfsroot_from_dhcp() returned with failure if one of
/tmp/net.$iface.override /tmp/dhclient.$iface.dhcpopts was missing
---

diff --git a/modules.d/95nfs/nfs-lib.sh b/modules.d/95nfs/nfs-lib.sh
index 4f3d184f7..1ccb416e5 100755
--- a/modules.d/95nfs/nfs-lib.sh
+++ b/modules.d/95nfs/nfs-lib.sh
@@ -91,7 +91,7 @@ anaconda_nfs_to_var() {
 nfsroot_from_dhcp() {
     local f
     for f in /tmp/net.$1.override /tmp/dhclient.$1.dhcpopts; do
-        [ -f $f ] && . $f || return
+        [ -f $f ] && . $f
     done
     [ -n "$new_root_path" ] && nfsroot_to_var "$nfs:$new_root_path"
     [ -z "$path" ] && [ "$(getarg root=)" == "/dev/nfs" ] && path=/tftpboot/%s