|
 |
cd44d12 |
diff -up open-iscsi-2.0-870.1/include/fw_context.h.workaround open-iscsi-2.0-870.1/include/fw_context.h
|
|
|
cd44d12 |
--- open-iscsi-2.0-870.1/include/fw_context.h.workaround 2009-03-20 15:47:16.000000000 +0100
|
|
|
cd44d12 |
+++ open-iscsi-2.0-870.1/include/fw_context.h 2009-03-20 15:48:03.000000000 +0100
|
|
|
cd44d12 |
@@ -51,5 +51,7 @@ struct boot_context {
|
|
|
cd44d12 |
|
|
|
cd44d12 |
extern int fw_get_entry(struct boot_context *context, const char *filepath);
|
|
|
cd44d12 |
extern void fw_print_entry(struct boot_context *context);
|
|
|
cd44d12 |
+extern int fwparam_ibft_sysfs(struct boot_context *context,
|
|
|
cd44d12 |
+ const char *filepath);
|
|
|
cd44d12 |
|
|
|
cd44d12 |
#endif /* FWPARAM_CONTEXT_H_ */
|
|
|
cd44d12 |
diff -up open-iscsi-2.0-870.1/libiscsi/libiscsi.c.workaround open-iscsi-2.0-870.1/libiscsi/libiscsi.c
|
|
|
cd44d12 |
--- open-iscsi-2.0-870.1/libiscsi/libiscsi.c.workaround 2009-03-20 15:45:28.000000000 +0100
|
|
|
cd44d12 |
+++ open-iscsi-2.0-870.1/libiscsi/libiscsi.c 2009-03-20 15:47:03.000000000 +0100
|
|
|
cd44d12 |
@@ -196,10 +196,10 @@ int libiscsi_discover_firmware(struct li
|
|
|
599c1c8 |
*found_nodes = NULL;
|
|
|
599c1c8 |
|
|
|
599c1c8 |
memset(&fw_entry, 0, sizeof fw_entry);
|
|
|
599c1c8 |
- rc = fw_get_entry(&fw_entry, NULL);
|
|
|
599c1c8 |
+ rc = fwparam_ibft_sysfs(&fw_entry, NULL);
|
|
|
599c1c8 |
if (rc) {
|
|
|
599c1c8 |
strcpy(context->error_str, "Could not read fw values.");
|
|
|
599c1c8 |
- return rc;
|
|
|
599c1c8 |
+ return ENODEV;
|
|
|
599c1c8 |
}
|
|
|
599c1c8 |
|
|
|
599c1c8 |
memset(&rec, 0, sizeof rec);
|
|
|
cd44d12 |
@@ -535,7 +535,7 @@ int libiscsi_get_firmware_network_config
|
|
|
599c1c8 |
|
|
|
599c1c8 |
memset(config, 0, sizeof *config);
|
|
|
599c1c8 |
memset(&fw_entry, 0, sizeof fw_entry);
|
|
|
599c1c8 |
- if (fw_get_entry(&fw_entry, NULL))
|
|
|
cd44d12 |
+ if (fwparam_ibft_sysfs(&fw_entry, NULL))
|
|
|
599c1c8 |
return ENODEV;
|
|
|
599c1c8 |
|
|
|
599c1c8 |
config->dhcp = strlen(fw_entry.dhcp) ? 1 : 0;
|
|
|
cd44d12 |
@@ -557,7 +557,7 @@ int libiscsi_get_firmware_initiator_name
|
|
|
599c1c8 |
|
|
|
599c1c8 |
memset(initiatorname, 0, LIBISCSI_VALUE_MAXLEN);
|
|
|
599c1c8 |
memset(&fw_entry, 0, sizeof fw_entry);
|
|
|
599c1c8 |
- if (fw_get_entry(&fw_entry, NULL))
|
|
|
cd44d12 |
+ if (fwparam_ibft_sysfs(&fw_entry, NULL))
|
|
|
599c1c8 |
return ENODEV;
|
|
|
599c1c8 |
|
|
|
599c1c8 |
strncpy(initiatorname, fw_entry.initiatorname,
|