diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2009-05-01 12:02:36 -0500 |
|---|---|---|
| committer | Mike Christie <michaelc@cs.wisc.edu> | 2009-05-01 12:02:36 -0500 |
| commit | df68c0fb600f3485bef37e9d29fe4e2fa32aff5d (patch) | |
| tree | 16033b77bd9cb8af362482f8935510c676efcb23 /utils | |
| parent | ae1a6ab8bdac2c7a1e1677bde223d1656d282474 (diff) | |
| download | open-iscsi-df68c0fb600f3485bef37e9d29fe4e2fa32aff5d.tar.gz | |
iscsi boot: fix nic ip-addr check
From Hans De Goede:
ip-addr will not exist when using dhcp, so raising an error
when it does not exist is wrong.
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/fwparam_ibft/fwparam_ibft_sysfs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/utils/fwparam_ibft/fwparam_ibft_sysfs.c b/utils/fwparam_ibft/fwparam_ibft_sysfs.c index 53bc3d5..fd80bb1 100644 --- a/utils/fwparam_ibft/fwparam_ibft_sysfs.c +++ b/utils/fwparam_ibft/fwparam_ibft_sysfs.c @@ -159,15 +159,13 @@ static int fill_nic_context(char *id, struct boot_context *context) sizeof(context->mac)); if (rc) return rc; - rc = sysfs_get_str(id, IBFT_SUBSYS, "ip-addr", context->ipaddr, - sizeof(context->ipaddr)); - if (rc) - return rc; rc = get_iface_from_device(id, context); if (rc) return rc; + sysfs_get_str(id, IBFT_SUBSYS, "ip-addr", context->ipaddr, + sizeof(context->ipaddr)); sysfs_get_str(id, IBFT_SUBSYS, "vlan", context->vlan, sizeof(context->vlan)); sysfs_get_str(id, IBFT_SUBSYS, "subnet-mask", context->mask, |