diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2010-07-10 00:26:13 -0500 |
|---|---|---|
| committer | Mike Christie <michaelc@cs.wisc.edu> | 2010-07-10 00:26:13 -0500 |
| commit | fe5cca505d6509dd67cefe85a96e0a4db6cedb4d (patch) | |
| tree | 30548c66cf734cad8e9583cb053d998e63719948 /utils | |
| parent | ef4cfcdc7b66a6783aa68af97f02a055908657f0 (diff) | |
| download | open-iscsi-fe5cca505d6509dd67cefe85a96e0a4db6cedb4d.tar.gz | |
iscsi boot: add support for iscsi boot sysfs module
This patch modifies the ibft sysfs code to support the
iscsi boot sysfs module which is used by be2iscsi to
export be2iscsi boot info.
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/fwparam_ibft/Makefile | 2 | ||||
| -rw-r--r-- | utils/fwparam_ibft/fw_entry.c | 6 | ||||
| -rw-r--r-- | utils/fwparam_ibft/fwparam.h | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/utils/fwparam_ibft/Makefile b/utils/fwparam_ibft/Makefile index b9e7988..ca07b76 100644 --- a/utils/fwparam_ibft/Makefile +++ b/utils/fwparam_ibft/Makefile @@ -22,7 +22,7 @@ # SYSDEPS_OBJS = $(wildcard ../sysdeps/*.o) -OBJS := fw_entry.o fwparam_ibft_sysfs.o $(SYSDEPS_OBJS) ../../usr/iscsi_net_util.o +OBJS := fw_entry.o fwparam_sysfs.o $(SYSDEPS_OBJS) ../../usr/iscsi_net_util.o OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o CLEANFILES = $(OBJS) *.output *~ diff --git a/utils/fwparam_ibft/fw_entry.c b/utils/fwparam_ibft/fw_entry.c index ae5d34a..bbdb6d2 100644 --- a/utils/fwparam_ibft/fw_entry.c +++ b/utils/fwparam_ibft/fw_entry.c @@ -102,8 +102,7 @@ int fw_get_entry(struct boot_context *context) ret = fwparam_ppc_boot_info(context); if (ret) - ret = fwparam_ibft_sysfs_boot_info(context); - + ret = fwparam_sysfs_boot_info(context); return ret; } @@ -124,8 +123,7 @@ int fw_get_targets(struct list_head *list) ret = fwparam_ppc_get_targets(list); if (ret) - ret = fwparam_ibft_sysfs_get_targets(list); - + ret = fwparam_sysfs_get_targets(list); return ret; } diff --git a/utils/fwparam_ibft/fwparam.h b/utils/fwparam_ibft/fwparam.h index a79213b..32e4961 100644 --- a/utils/fwparam_ibft/fwparam.h +++ b/utils/fwparam_ibft/fwparam.h @@ -24,8 +24,8 @@ struct boot_context; -int fwparam_ibft_sysfs_boot_info(struct boot_context *context); -int fwparam_ibft_sysfs_get_targets(struct list_head *list); +int fwparam_sysfs_boot_info(struct boot_context *context); +int fwparam_sysfs_get_targets(struct list_head *list); int fwparam_ppc_boot_info(struct boot_context *context); int fwparam_ppc_get_targets(struct list_head *list); |