File iscsi-initiator-utils-relax-ibft-checks.patch of Package iscsi-initiator-utils870.3

File iscsi-initiator-utils-relax-ibft-checks.patch of Package iscsi-initiator-utils870.3 (Revision 67b063de67cf0cc30039087d64ef8cdd)

Currently displaying revision 67b063de67cf0cc30039087d64ef8cdd, show latest

diff -aurp open-iscsi-2.0-868-test1.tmp/utils/fwparam_ibft/fwparam_ibft_sysfs.c open-iscsi-2.0-868-test1.work/utils/fwparam_ibft/fwparam_ibft_sysfs.c
--- open-iscsi-2.0-868-test1.tmp/utils/fwparam_ibft/fwparam_ibft_sysfs.c	2008-08-06 08:37:50.000000000 -0500
+++ open-iscsi-2.0-868-test1.work/utils/fwparam_ibft/fwparam_ibft_sysfs.c	2008-08-06 09:44:05.000000000 -0500
@@ -197,20 +197,23 @@ static int fill_nic_context(const char *
 	int rc = 0;
 
 	rc |= read_data(dir, "/mac", context->mac, sizeof(context->mac));
-	rc |= read_data(dir, "/vlan", context->vlan, sizeof(context->vlan));
 	rc |= read_data(dir, "/ip-addr", context->ipaddr,
 		sizeof(context->ipaddr));
 	rc |= read_data(dir, "/subnet-mask", context->mask,
 			sizeof(context->mask));
 	rc |= read_data(dir, "/gateway", context->gateway,
 			sizeof(context->gateway));
-	rc |= read_data(dir, "/primary-dns", context->primary_dns,
-			sizeof(context->primary_dns));
-	rc |= read_data(dir, "/secondary-dns", context->secondary_dns,
-			sizeof(context->secondary_dns));
-	rc |= read_data(dir, "/dhcp", context->dhcp, sizeof(context->dhcp));
+	/*
+	 * The following are not always exported.
+	 */
+	read_data(dir, "/vlan", context->vlan, sizeof(context->vlan));
+	read_data(dir, "/primary-dns", context->primary_dns,
+		  sizeof(context->primary_dns));
+	read_data(dir, "/secondary-dns", context->secondary_dns,
+		  sizeof(context->secondary_dns));
+	read_data(dir, "/dhcp", context->dhcp, sizeof(context->dhcp));
 
-	rc |= get_iface_from_device(dir, context);
+	get_iface_from_device(dir, context);
 
 	return rc;
 }